diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 02:53:50 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 02:53:50 +0000 |
| commit | aab7847ca789eb9ebb0f34bf61a6e4dd4c8769ea (patch) | |
| tree | b2c76bc6112a956f59a01cf74a7b89b3d5943a73 /base/test | |
| parent | 7d2f9a3e37b0d59b790bd48e7e8bb2c3bae8613b (diff) | |
| download | chromium_src-aab7847ca789eb9ebb0f34bf61a6e4dd4c8769ea.zip chromium_src-aab7847ca789eb9ebb0f34bf61a6e4dd4c8769ea.tar.gz chromium_src-aab7847ca789eb9ebb0f34bf61a6e4dd4c8769ea.tar.bz2 | |
SystemMonitor: Pull device type into the device id
Add a utility class to create an split device ids as well as to get some information about devices.
BUG=NONE
Review URL: https://chromiumcodereview.appspot.com/10829384
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
| -rw-r--r-- | base/test/mock_devices_changed_observer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/base/test/mock_devices_changed_observer.h b/base/test/mock_devices_changed_observer.h index 10f8840..7188ab8 100644 --- a/base/test/mock_devices_changed_observer.h +++ b/base/test/mock_devices_changed_observer.h @@ -20,10 +20,9 @@ class MockDevicesChangedObserver MOCK_METHOD1(OnDevicesChanged, void(base::SystemMonitor::DeviceType device_type)); - MOCK_METHOD4(OnMediaDeviceAttached, + MOCK_METHOD3(OnMediaDeviceAttached, void(const std::string& id, const string16& name, - base::SystemMonitor::MediaDeviceType type, const FilePath::StringType& location)); MOCK_METHOD1(OnMediaDeviceDetached, void(const std::string& id)); |