diff options
| author | JackLivio <jack@livio.io> | 2018-04-18 10:55:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 10:55:48 -0400 |
| commit | 7f7fcbb998fb17f2954fd103349af67ea9b71a3f (patch) | |
| tree | 55640424c5774fce04f01876fa1a4d281002c52e /src/components/include/test/media_manager/mock_media_manager.h | |
| parent | 61fd83fed0dc584019b305bebc82512d2c42b9e7 (diff) | |
| parent | 11ffe206ea3c114da3f45a5cbb9b23834d2996c8 (diff) | |
| download | sdl_core-7f7fcbb998fb17f2954fd103349af67ea9b71a3f.tar.gz | |
Merge pull request #2133 from smartdevicelink/release/4.5.14.5.1success,-HMI-show-radio-screenfix/check_transport_manager_initfeature/external_proprietary_policy
Release/4.5.1
Diffstat (limited to 'src/components/include/test/media_manager/mock_media_manager.h')
| -rw-r--r-- | src/components/include/test/media_manager/mock_media_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/include/test/media_manager/mock_media_manager.h b/src/components/include/test/media_manager/mock_media_manager.h index 9cd2a05fc0..b58cfab5d7 100644 --- a/src/components/include/test/media_manager/mock_media_manager.h +++ b/src/components/include/test/media_manager/mock_media_manager.h @@ -56,7 +56,7 @@ class MockMediaManager : public media_manager::MediaManager { protocol_handler::ServiceType service_type)); MOCK_METHOD2(FramesProcessed, void(int32_t application_key, int32_t frame_number)); - MOCK_CONST_METHOD0(settings, const MediaManagerSettings&()); + MOCK_CONST_METHOD0(settings, const media_manager::MediaManagerSettings&()); }; } // namespace media_manager_test |