chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc - Issue 14016002: Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/storage_monitor/storage_monitor_chromeos_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

« no previous file with comments | « chrome/browser/storage_monitor/storage_monitor_chromeos.cc ('k') | chrome/browser/storage_monitor/storage_monitor_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc

===================================================================

--- chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc (revision 194743)

+++ chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc (working copy)

@@ -16,6 +16,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_info.h"

+#include "chrome/browser/storage_monitor/test_media_transfer_protocol_manager_linux.h"

#include "chromeos/disks/mock_disk_mount_manager.h"

#include "content/public/test/test_browser_thread.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -64,6 +65,12 @@

virtual ~TestStorageMonitorCros() {}

+ void Init() {

+ SetMediaTransferProtocolManagerForTest(

+ new chrome::TestMediaTransferProtocolManagerLinux());

+ StorageMonitorCros::Init();

+ }

virtual void OnMountEvent(

disks::DiskMountManager::MountEvent event,

MountError error_code,

@@ -171,6 +178,7 @@

// Initialize the test subject.

monitor_.reset(new TestStorageMonitorCros());

+ monitor_->Init();

monitor_->AddObserver(mock_storage_observer_.get());

}