summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tabs
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/browser/tabs
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/browser/tabs')
-rw-r--r--chrome/browser/tabs/tab_strip_model_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index a21ef74..21ed2a5 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -5,7 +5,6 @@
#include <map>
#include <string>
-#include "app/system_monitor.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/path_service.h"
@@ -36,6 +35,7 @@
#include "chrome/common/url_constants.h"
#include "chrome/test/testing_profile.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/system_monitor/system_monitor.h"
using testing::_;
@@ -230,8 +230,8 @@ class TabStripModelTest : public RenderViewHostTestHarness {
std::wstring profile_path_;
std::map<TabContents*, int> foo_;
- // ProfileManager requires a SystemMonitor.
- SystemMonitor system_monitor;
+ // ProfileManager requires a ui::SystemMonitor.
+ ui::SystemMonitor system_monitor;
ProfileManager pm_;
};