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

Unified Diff: chrome/browser/tabs/tab_strip_model_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/profiles/profile_manager_unittest.cc ('k') | chrome/test/in_process_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tabs/tab_strip_model_unittest.cc
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 1bb904d95c692e9376f61546f15708abf3987b5b..fa49550a0b29e4c658fb697e943276d9801f9def 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -153,7 +153,12 @@ class TabStripModelTest : public RenderViewHostTestHarness {
public:
TabStripModelTest()
: RenderViewHostTestHarness(),
- browser_thread_(BrowserThread::UI, &message_loop_) {}
+ browser_thread_(BrowserThread::UI, &message_loop_) {
+#if defined(OS_MACOSX)
+ base::SystemMonitor::AllocateSystemIOPorts();
+#endif
+ system_monitor.reset(new base::SystemMonitor);
+ }
TabContentsWrapper* CreateTabContents() {
return Browser::TabContentsFactory(profile(), NULL, 0, NULL, NULL);
@@ -270,7 +275,7 @@ class TabStripModelTest : public RenderViewHostTestHarness {
std::map<TabContents*, int> foo_;
// ProfileManager requires a base::SystemMonitor.
- base::SystemMonitor system_monitor;
+ scoped_ptr<base::SystemMonitor> system_monitor;
ProfileManager pm_;
};
« no previous file with comments | « chrome/browser/profiles/profile_manager_unittest.cc ('k') | chrome/test/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698