chrome/browser/extensions/extension_event_router_forwarder_unittest.cc - Issue 7042003: Revert 85732 (broke build) - Move SystemMonitor to base/.

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/extensions/extension_event_router_forwarder_unittest.cc

Issue 7042003: Revert 85732 (broke build) - Move SystemMonitor to base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

Index: chrome/browser/extensions/extension_event_router_forwarder_unittest.cc

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

--- chrome/browser/extensions/extension_event_router_forwarder_unittest.cc (revision 85733)

+++ chrome/browser/extensions/extension_event_router_forwarder_unittest.cc (working copy)

@@ -5,7 +5,6 @@

#include "chrome/browser/extensions/extension_event_router_forwarder.h"

#include "base/message_loop.h"

-#include "base/system_monitor/system_monitor.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/test/testing_browser_process_test.h"

#include "chrome/test/testing_profile.h"

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

#include "googleurl/src/gurl.h"

#include "testing/gmock/include/gmock/gmock.h"

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

+#include "ui/base/system_monitor/system_monitor.h"

namespace {

@@ -66,7 +66,7 @@

MessageLoopForUI message_loop_;

BrowserThread ui_thread_;

BrowserThread io_thread_;

- base::SystemMonitor dummy;

+ ui::SystemMonitor dummy;

// Profiles are weak pointers, owned by ProfileManager in |browser_process_|.

TestingProfile* profile1_;

TestingProfile* profile2_;

« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/profiles/profile_manager.h » ('j') | no next file with comments »