chrome/browser/storage_monitor/storage_monitor_linux_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_linux_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_linux.cc ('k') | chrome/browser/storage_monitor/storage_monitor_mac.mm » ('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_linux_unittest.cc

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

index 55fc87796150acbc701170e3841499da6d4c2ed1..0855e258ffc260ae58c32be6f4ea3caf14a2db3b 100644

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

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

@@ -23,6 +23,7 @@

#include "chrome/browser/storage_monitor/storage_info.h"

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

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

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

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

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

@@ -181,7 +182,7 @@ class StorageMonitorLinuxTest : public testing::Test {

arraysize(initial_test_data),

true /* overwrite */);

- // Initialize the test subject.

+ test::TestStorageMonitor::RemoveSingleton();

monitor_.reset(new TestStorageMonitorLinux(mtab_file_, &message_loop_));

mock_storage_observer_.reset(new MockRemovableStorageObserver);

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