chrome/browser/profiles/profile_manager_unittest.cc - Issue 7235023: Mac: Split SystemMonitor initialization so it's not blocked by the Sandbox.

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/profiles/profile_manager_unittest.cc

Issue 7235023: Mac: Split SystemMonitor initialization so it's not blocked by the Sandbox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Synced to trunk Created 9 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

« no previous file with comments | « chrome/browser/extensions/extension_event_router_forwarder_unittest.cc ('k') | chrome/browser/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_manager_unittest.cc

diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc

index cce457aaedd3b697c761d1adaf89199e9a646c30..e23b30a8f1a6b80cc9a7da775c93126700b75a7d 100644

--- a/chrome/browser/profiles/profile_manager_unittest.cc

+++ b/chrome/browser/profiles/profile_manager_unittest.cc

@@ -38,6 +38,10 @@ class ProfileManagerTest : public TestingBrowserProcessTest {

file_thread_(BrowserThread::FILE, &message_loop_),

profile_manager_(new ProfileManagerWithoutInit),

local_state_(testing_browser_process_.get()) {

+#if defined(OS_MACOSX)

+ base::SystemMonitor::AllocateSystemIOPorts();

+#endif

+ system_monitor_dummy_.reset(new base::SystemMonitor);

}

virtual void SetUp() {

@@ -61,7 +65,7 @@ class ProfileManagerTest : public TestingBrowserProcessTest {

BrowserThread ui_thread_;

BrowserThread file_thread_;

- base::SystemMonitor system_monitor_dummy_;

+ scoped_ptr<base::SystemMonitor> system_monitor_dummy_;

// Also will test profile deletion.

scoped_ptr<ProfileManager> profile_manager_;