diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
| commit | 42ce29d4f464b36ddaebefb6d6c33e7418e93141 (patch) | |
| tree | 0d0a4965d61ef1514dee70c9f2507529d8c5b178 /chrome/test | |
| parent | 0ffeb598304f119e2d3df70d47a592d2dbc722da (diff) | |
| download | chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.zip chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.gz chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.bz2 | |
Move ResourceBundle, DataPack to ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6263008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/automation_proxy_uitest.cc | 1 | ||||
| -rw-r--r-- | chrome/test/unit/chrome_test_suite.cc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index e6db497..bd9cef0 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -42,6 +42,7 @@ #include "testing/gmock_mutant.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/message_box_flags.h" +#include "ui/base/ui_base_switches.h" #include "views/event.h" using ui_test_utils::TimedMessageLoopRunner; diff --git a/chrome/test/unit/chrome_test_suite.cc b/chrome/test/unit/chrome_test_suite.cc index 042ab98..5dfac21 100644 --- a/chrome/test/unit/chrome_test_suite.cc +++ b/chrome/test/unit/chrome_test_suite.cc @@ -5,7 +5,6 @@ #include "chrome/test/unit/chrome_test_suite.h" #include "app/app_paths.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/metrics/stats_table.h" @@ -17,6 +16,8 @@ #include "chrome/common/url_constants.h" #include "chrome/test/testing_browser_process.h" #include "net/base/net_errors.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" @@ -94,6 +95,7 @@ void ChromeTestSuite::Initialize() { chrome::RegisterPathProvider(); app::RegisterPathProvider(); + ui::RegisterPathProvider(); g_browser_process = new TestingBrowserProcess; if (!browser_dir_.empty()) { |