diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 02:20:13 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 02:20:13 +0000 |
| commit | 4b59a4240d02d872cb94b529cc38cee34360a5dd (patch) | |
| tree | 45cea3ce45d3571c60d5b6e87f8214e105664ae0 /base/test | |
| parent | f160e2fef08c9e12336efb14834ec36ce7d2a685 (diff) | |
| download | chromium_src-4b59a4240d02d872cb94b529cc38cee34360a5dd.zip chromium_src-4b59a4240d02d872cb94b529cc38cee34360a5dd.tar.gz chromium_src-4b59a4240d02d872cb94b529cc38cee34360a5dd.tar.bz2 | |
Revert 124288 (made mac browser and ui_tests flaky) - Add Media device notification to SystemMonitor and Mac impl
BUG=110400
TEST=run chrome with -v=1, attach and a mass storage media device and observe the log entries for the attach and detach events.
Review URL: https://chromiumcodereview.appspot.com/9363008
TBR=vandebo@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9555014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
| -rw-r--r-- | base/test/mock_devices_changed_observer.cc | 17 | ||||
| -rw-r--r-- | base/test/mock_devices_changed_observer.h | 36 |
2 files changed, 0 insertions, 53 deletions
diff --git a/base/test/mock_devices_changed_observer.cc b/base/test/mock_devices_changed_observer.cc deleted file mode 100644 index 25ff613..0000000 --- a/base/test/mock_devices_changed_observer.cc +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/test/mock_devices_changed_observer.h" - -#include "base/file_path.h" - -namespace base { - -MockDevicesChangedObserver::MockDevicesChangedObserver() { -} - -MockDevicesChangedObserver::~MockDevicesChangedObserver() { -} - -} // namespace base diff --git a/base/test/mock_devices_changed_observer.h b/base/test/mock_devices_changed_observer.h deleted file mode 100644 index 9964f06..0000000 --- a/base/test/mock_devices_changed_observer.h +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef BASE_TEST_MOCK_DEVICES_CHANGED_OBSERVER_H_ -#define BASE_TEST_MOCK_DEVICES_CHANGED_OBSERVER_H_ - -#include <string> - -#include "base/system_monitor/system_monitor.h" -#include "testing/gmock/include/gmock/gmock.h" - -class FilePath; - -namespace base { - -class MockDevicesChangedObserver - : public base::SystemMonitor::DevicesChangedObserver { - public: - MockDevicesChangedObserver(); - ~MockDevicesChangedObserver(); - - MOCK_METHOD0(OnDevicesChanged, void()); - MOCK_METHOD3(OnMediaDeviceAttached, - void(const base::SystemMonitor::DeviceIdType& id, - const std::string& name, - const FilePath& path)); - MOCK_METHOD1(OnMediaDeviceDetached, - void(const base::SystemMonitor::DeviceIdType& id)); - - DISALLOW_COPY_AND_ASSIGN(MockDevicesChangedObserver); -}; - -} // namespace base - -#endif // BASE_TEST_MOCK_DEVICES_CHANGED_OBSERVER_H_ |