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

Unified Diff: chrome/browser/storage_monitor/test_storage_monitor.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
« no previous file with comments | « chrome/browser/storage_monitor/test_storage_monitor.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/storage_monitor/test_storage_monitor.cc
===================================================================
--- chrome/browser/storage_monitor/test_storage_monitor.cc (revision 194743)
+++ chrome/browser/storage_monitor/test_storage_monitor.cc (working copy)
@@ -6,11 +6,21 @@
#include "chrome/browser/storage_monitor/media_storage_util.h"
+#if defined(OS_LINUX)
+#include "chrome/browser/storage_monitor/test_media_transfer_protocol_manager_linux.h"
+#include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
+#endif
+
namespace chrome {
namespace test {
TestStorageMonitor::TestStorageMonitor()
- : StorageMonitor() {}
+ : StorageMonitor() {
+#if defined(OS_LINUX)
+ media_transfer_protocol_manager_.reset(
+ new TestMediaTransferProtocolManagerLinux());
+#endif
+}
TestStorageMonitor::~TestStorageMonitor() {}
@@ -45,6 +55,13 @@
}
#endif
+#if defined(OS_LINUX)
+device::MediaTransferProtocolManager*
+TestStorageMonitor::media_transfer_protocol_manager() {
+ return media_transfer_protocol_manager_.get();
+}
+#endif
+
StorageMonitor::Receiver* TestStorageMonitor::receiver() const {
return StorageMonitor::receiver();
}
« no previous file with comments | « chrome/browser/storage_monitor/test_storage_monitor.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698