summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/net/fake_external_tab.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 21:22:31 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 21:22:31 +0000
commit08110ceae09a5e148e67bebd712e7ba1840ccf42 (patch)
tree94bdbbc82317bc6f7579d552aace6becd1beaab2 /chrome_frame/test/net/fake_external_tab.cc
parenta61c5c9bb6524d77c30b6a18f542c0e4616ee7bc (diff)
downloadchromium_src-08110ceae09a5e148e67bebd712e7ba1840ccf42.zip
chromium_src-08110ceae09a5e148e67bebd712e7ba1840ccf42.tar.gz
chromium_src-08110ceae09a5e148e67bebd712e7ba1840ccf42.tar.bz2
Move SystemMonitor to src/ui/base/system_monitor.
Move HiResTimerManager to src/chrome/common. BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6361002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/net/fake_external_tab.cc')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 118496c..c48af62 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -183,7 +183,7 @@ FakeExternalTab::~FakeExternalTab() {
void FakeExternalTab::Initialize() {
DCHECK(g_browser_process == NULL);
- SystemMonitor system_monitor;
+ ui::SystemMonitor system_monitor;
// The gears plugin causes the PluginRequestInterceptor to kick in and it
// will cause problems when it tries to intercept URL requests.