diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:14:08 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:14:08 +0000 |
| commit | 5f988b937aedc6facdd9854ad3fc7fbdf6c9f894 (patch) | |
| tree | ef48163d1446a13e8981b0dfbbcb906bcf2c867b /chrome/browser/tabs | |
| parent | 263d2140c09aab094d045eb0736b22236290dd6d (diff) | |
| download | chromium_src-5f988b937aedc6facdd9854ad3fc7fbdf6c9f894.zip chromium_src-5f988b937aedc6facdd9854ad3fc7fbdf6c9f894.tar.gz chromium_src-5f988b937aedc6facdd9854ad3fc7fbdf6c9f894.tar.bz2 | |
Revert 85732 (broke build) - Move SystemMonitor to base/.
I plan to use SystemMonitor in net/.
Fix up the Mac implementation not to use Cocoa APIs since @interface is not allowed in base.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7015017
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/7042003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model_unittest.cc | 6 |
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 3077f8c..fc1c941 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -13,7 +13,6 @@ #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" -#include "base/system_monitor/system_monitor.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_tab_helper.h" @@ -38,6 +37,7 @@ #include "content/common/notification_source.h" #include "content/common/property_bag.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/system_monitor/system_monitor.h" using testing::_; @@ -262,8 +262,8 @@ class TabStripModelTest : public RenderViewHostTestHarness { std::wstring profile_path_; std::map<TabContents*, int> foo_; - // ProfileManager requires a base::SystemMonitor. - base::SystemMonitor system_monitor; + // ProfileManager requires a ui::SystemMonitor. + ui::SystemMonitor system_monitor; ProfileManager pm_; }; |