chrome/browser/storage_monitor/storage_monitor_unittest.cc - Issue 16703025: [StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

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_unittest.cc

Issue 16703025: [StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 7 years, 6 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

« chrome/browser/media_galleries/media_galleries_preferences_unittest.cc ('K') | « chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm ('k') | chrome/browser/storage_monitor/storage_monitor_win.h » ('j') | chrome/browser/storage_monitor/test_storage_monitor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/storage_monitor_unittest.cc

diff --git a/chrome/browser/storage_monitor/storage_monitor_unittest.cc b/chrome/browser/storage_monitor/storage_monitor_unittest.cc

index 9be3a508d434b5a9dd9191358a2efc086af559cf..b0aee9239d2cc3aa87f9a52aad6196eb0d712aa6 100644

--- a/chrome/browser/storage_monitor/storage_monitor_unittest.cc

+++ b/chrome/browser/storage_monitor/storage_monitor_unittest.cc

@@ -13,6 +13,7 @@

namespace chrome {

TEST(StorageMonitorTest, TestInitialize) {

+ test::TestStorageMonitor::RemoveSingleton();

test::TestStorageMonitor monitor;

EXPECT_FALSE(monitor.init_called_);

@@ -32,6 +33,7 @@ TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {

const std::string kDeviceId2 = "dcim:UUID:FFF0-0002";

MockRemovableStorageObserver observer1;

MockRemovableStorageObserver observer2;

+ test::TestStorageMonitor::RemoveSingleton();

test::TestStorageMonitor monitor;

monitor.AddObserver(&observer1);

monitor.AddObserver(&observer2);

@@ -74,6 +76,7 @@ TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {

TEST(StorageMonitorTest, GetAllAvailableStoragesEmpty) {

base::MessageLoop message_loop;

+ test::TestStorageMonitor::RemoveSingleton();

test::TestStorageMonitor monitor;

std::vector<StorageInfo> devices = monitor.GetAllAvailableStorages();

EXPECT_EQ(0U, devices.size());

@@ -81,6 +84,7 @@ TEST(StorageMonitorTest, GetAllAvailableStoragesEmpty) {

TEST(StorageMonitorTest, GetAllAvailableStorageAttachDetach) {

base::MessageLoop message_loop;

+ test::TestStorageMonitor::RemoveSingleton();

test::TestStorageMonitor monitor;

const std::string kDeviceId1 = "dcim:UUID:FFF0-0042";

const string16 kDeviceName1 = ASCIIToUTF16("test");