Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2171)

Unified Diff: chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc

Issue 14016002: Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix browser_tests Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
===================================================================
--- chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc (revision 194743)
+++ chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc (working copy)
@@ -22,6 +22,7 @@
#include "chrome/browser/storage_monitor/mock_removable_storage_observer.h"
#include "chrome/browser/storage_monitor/removable_device_constants.h"
#include "chrome/browser/storage_monitor/storage_monitor.h"
+#include "chrome/browser/storage_monitor/test_media_transfer_protocol_manager_linux.h"
#include "content/public/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -143,6 +144,8 @@
TestStorageMonitorLinux(const base::FilePath& path, MessageLoop* message_loop)
: StorageMonitorLinux(path),
message_loop_(message_loop) {
+ SetMediaTransferProtocolManagerForTest(
+ new TestMediaTransferProtocolManagerLinux());
SetGetDeviceInfoCallbackForTest(base::Bind(&GetDeviceInfo));
}
virtual ~TestStorageMonitorLinux() {}
@@ -257,7 +260,7 @@
return *mock_storage_observer_;
}
- StorageMonitorLinux* notifier() {
+ StorageMonitor* notifier() {
return monitor_.get();
}

Powered by Google App Engine
This is Rietveld 408576698