From aab7847ca789eb9ebb0f34bf61a6e4dd4c8769ea Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Tue, 21 Aug 2012 02:53:50 +0000 Subject: 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 --- base/test/mock_devices_changed_observer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'base/test') 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)); -- cgit v1.1