summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/test/base/interactive_ui_tests_main.cc3
-rw-r--r--ui/app_list/test/run_all_unittests.cc11
-rw-r--r--ui/base/ui_base_paths.cc5
-rw-r--r--ui/base/ui_base_paths.h6
-rw-r--r--ui/keyboard/test/run_all_unittests.cc11
-rw-r--r--ui/message_center/test/run_all_unittests.cc11
-rw-r--r--ui/views/corewm/desktop_capture_controller_unittest.cc10
-rw-r--r--ui/views/examples/content_client/examples_main_delegate.cc14
-rw-r--r--ui/views/examples/content_client/examples_main_delegate.h2
-rw-r--r--ui/views/examples/examples_main.cc11
-rw-r--r--ui/views/run_all_unittests.cc11
-rw-r--r--ui/views/widget/widget_interactive_uitest.cc17
-rw-r--r--ui/wm/test/run_all_unittests.cc11
13 files changed, 71 insertions, 52 deletions
diff --git a/chrome/test/base/interactive_ui_tests_main.cc b/chrome/test/base/interactive_ui_tests_main.cc
index 2910b55..f16f456 100644
--- a/chrome/test/base/interactive_ui_tests_main.cc
+++ b/chrome/test/base/interactive_ui_tests_main.cc
@@ -6,7 +6,6 @@
#include "chrome/test/base/chrome_test_suite.h"
#include "ui/base/test/ui_controls.h"
-#include "ui/base/ui_base_paths.h"
#if defined(USE_AURA)
#include "ui/aura/test/ui_controls_factory_aura.h"
@@ -34,8 +33,6 @@ class InteractiveUITestSuite : public ChromeTestSuite {
virtual void Initialize() OVERRIDE {
ChromeTestSuite::Initialize();
- ui::RegisterPathProvider();
-
// Only allow ui_controls to be used in interactive_ui_tests, since they
// depend on focus and can't be sharded.
ui_controls::EnableUIControls();
diff --git a/ui/app_list/test/run_all_unittests.cc b/ui/app_list/test/run_all_unittests.cc
index fa3c94b..48dd5a8 100644
--- a/ui/app_list/test/run_all_unittests.cc
+++ b/ui/app_list/test/run_all_unittests.cc
@@ -8,7 +8,6 @@
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
@@ -30,9 +29,13 @@ class AppListTestSuite : public base::TestSuite {
base::TestSuite::Initialize();
ui::RegisterPathProvider();
- base::FilePath ui_test_pak_path;
- ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
}
virtual void Shutdown() OVERRIDE {
diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc
index 85723b5..ee7566e 100644
--- a/ui/base/ui_base_paths.cc
+++ b/ui/base/ui_base_paths.cc
@@ -58,11 +58,6 @@ bool PathProvider(int key, base::FilePath* result) {
cur = cur.Append(FILE_PATH_LITERAL("paks"));
break;
#endif
- case UI_TEST_PAK:
- if (!PathService::Get(base::DIR_MODULE, &cur))
- return false;
- cur = cur.AppendASCII("ui_test.pak");
- break;
default:
return false;
}
diff --git a/ui/base/ui_base_paths.h b/ui/base/ui_base_paths.h
index 2a3e062..cd2c230 100644
--- a/ui/base/ui_base_paths.h
+++ b/ui/base/ui_base_paths.h
@@ -8,8 +8,8 @@
#include "build/build_config.h"
#include "ui/base/ui_base_export.h"
-// This file declares path keys for various special directories. These can be
-// used with the PathService to access these directories and files.
+// This file declares path keys for the app module. These can be used with
+// the PathService to access various special directories and files.
namespace ui {
@@ -25,8 +25,6 @@ enum {
DIR_RESOURCE_PAKS_ANDROID,
#endif
- UI_TEST_PAK,
-
PATH_END
};
diff --git a/ui/keyboard/test/run_all_unittests.cc b/ui/keyboard/test/run_all_unittests.cc
index 9ecd0c6..d5e5bc0 100644
--- a/ui/keyboard/test/run_all_unittests.cc
+++ b/ui/keyboard/test/run_all_unittests.cc
@@ -8,7 +8,6 @@
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/gl/gl_surface.h"
@@ -25,9 +24,13 @@ class KeyboardTestSuite : public base::TestSuite {
gfx::GLSurface::InitializeOneOffForTests();
ui::RegisterPathProvider();
- base::FilePath ui_test_pak_path;
- ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
}
virtual void Shutdown() OVERRIDE {
diff --git a/ui/message_center/test/run_all_unittests.cc b/ui/message_center/test/run_all_unittests.cc
index f657e04..1688dd7 100644
--- a/ui/message_center/test/run_all_unittests.cc
+++ b/ui/message_center/test/run_all_unittests.cc
@@ -8,7 +8,6 @@
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
@@ -30,9 +29,13 @@ class MessageCenterTestSuite : public base::TestSuite {
base::TestSuite::Initialize();
ui::RegisterPathProvider();
- base::FilePath ui_test_pak_path;
- ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
}
virtual void Shutdown() OVERRIDE {
diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc
index 03280da..8807aafd 100644
--- a/ui/views/corewm/desktop_capture_controller_unittest.cc
+++ b/ui/views/corewm/desktop_capture_controller_unittest.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "base/path_service.h"
-#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/env.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/test/test_window_delegate.h"
@@ -35,10 +34,11 @@ class DesktopCaptureControllerTest : public ViewsTestBase {
virtual void SetUp() OVERRIDE {
gfx::GLSurface::InitializeOneOffForTests();
-
- base::FilePath ui_test_pak_path;
- ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
ViewsTestBase::SetUp();
}
diff --git a/ui/views/examples/content_client/examples_main_delegate.cc b/ui/views/examples/content_client/examples_main_delegate.cc
index 5680ea3..aabd289 100644
--- a/ui/views/examples/content_client/examples_main_delegate.cc
+++ b/ui/views/examples/content_client/examples_main_delegate.cc
@@ -57,9 +57,7 @@ bool ExamplesMainDelegate::BasicStartupComplete(int* exit_code) {
}
void ExamplesMainDelegate::PreSandboxStartup() {
- base::FilePath ui_test_pak_path;
- DCHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ InitializeResourceBundle();
}
content::ContentBrowserClient*
@@ -68,5 +66,15 @@ content::ContentBrowserClient*
return browser_client_.get();
}
+void ExamplesMainDelegate::InitializeResourceBundle() {
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
+}
+
} // namespace examples
} // namespace views
diff --git a/ui/views/examples/content_client/examples_main_delegate.h b/ui/views/examples/content_client/examples_main_delegate.h
index 1bfd5c3..c52fd81 100644
--- a/ui/views/examples/content_client/examples_main_delegate.h
+++ b/ui/views/examples/content_client/examples_main_delegate.h
@@ -28,6 +28,8 @@ class ExamplesMainDelegate : public content::ContentMainDelegate {
virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
private:
+ void InitializeResourceBundle();
+
scoped_ptr<ExamplesContentBrowserClient> browser_client_;
content::ShellContentClient content_client_;
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index 848a8e5..d1be4b6 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -12,7 +12,6 @@
#include "ui/aura/env.h"
#include "ui/base/ime/input_method_initializer.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
#include "ui/compositor/test/in_process_context_factory.h"
#include "ui/gfx/screen.h"
#include "ui/gl/gl_surface.h"
@@ -59,11 +58,13 @@ int main(int argc, char** argv) {
base::i18n::InitializeICU();
- ui::RegisterPathProvider();
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
- base::FilePath ui_test_pak_path;
- DCHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
aura::Env::CreateInstance(true);
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc
index e5d7b9d..63b1fd5 100644
--- a/ui/views/run_all_unittests.cc
+++ b/ui/views/run_all_unittests.cc
@@ -8,7 +8,6 @@
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/gl/gl_surface.h"
@@ -23,9 +22,13 @@ class ViewTestSuite : public base::TestSuite {
gfx::GLSurface::InitializeOneOffForTests();
ui::RegisterPathProvider();
- base::FilePath ui_test_pak_path;
- ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
}
virtual void Shutdown() OVERRIDE {
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 693df43..ae547ad 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -7,7 +7,6 @@
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
-#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/client/focus_client.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
@@ -156,9 +155,11 @@ class WidgetTestInteractive : public WidgetTest {
virtual void SetUp() OVERRIDE {
gfx::GLSurface::InitializeOneOffForTests();
- base::FilePath ui_test_pak_path;
- ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
WidgetTest::SetUp();
}
};
@@ -739,9 +740,11 @@ class WidgetCaptureTest : public ViewsTestBase {
virtual void SetUp() OVERRIDE {
gfx::GLSurface::InitializeOneOffForTests();
- base::FilePath ui_test_pak_path;
- ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
ViewsTestBase::SetUp();
}
diff --git a/ui/wm/test/run_all_unittests.cc b/ui/wm/test/run_all_unittests.cc
index 6e04469..d399ca1 100644
--- a/ui/wm/test/run_all_unittests.cc
+++ b/ui/wm/test/run_all_unittests.cc
@@ -8,7 +8,6 @@
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/gl/gl_surface.h"
@@ -23,9 +22,13 @@ class WMTestSuite : public base::TestSuite {
gfx::GLSurface::InitializeOneOffForTests();
ui::RegisterPathProvider();
- base::FilePath ui_test_pak_path;
- ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
- ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+ base::FilePath pak_dir;
+ PathService::Get(base::DIR_MODULE, &pak_dir);
+
+ base::FilePath pak_file;
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
}
virtual void Shutdown() OVERRIDE {
generated by cgit v1.1 at 2025-03-12 19:50:50 +0000