Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: athena/main/athena_shell.cc

Issue 420663004: Make athena_unittests pass if the chrome executable is not built (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/main/athena_main.gyp ('k') | athena/test/athena_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_shell.cc
diff --git a/athena/main/athena_shell.cc b/athena/main/athena_shell.cc
index cd017ed8eff0642738e7eb4f3f26863534f078ac..b4dd4a40c7239c29da33578d7c20eb9078c3cee1 100644
--- a/athena/main/athena_shell.cc
+++ b/athena/main/athena_shell.cc
@@ -6,6 +6,7 @@
#include "athena/activity/public/activity_manager.h"
#include "athena/test/athena_test_helper.h"
#include "base/at_exit.h"
+#include "base/base_paths.h"
#include "base/command_line.h"
#include "base/i18n/icu_util.h"
#include "base/message_loop/message_loop.h"
@@ -13,7 +14,6 @@
#include "base/run_loop.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
#include "ui/compositor/test/context_factories_for_test.h"
#include "ui/gl/gl_surface.h"
@@ -46,14 +46,14 @@ int main(int argc, const char **argv) {
setlocale(LC_ALL, "");
base::AtExitManager exit_manager;
- ui::RegisterPathProvider();
base::CommandLine::Init(argc, argv);
base::i18n::InitializeICU();
gfx::GLSurface::InitializeOneOffForTests();
- 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 test_pak_path;
+ CHECK(PathService::Get(base::DIR_MODULE, &test_pak_path));
+ test_pak_path = test_pak_path.AppendASCII("athena_resources.pak");
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(test_pak_path);
base::MessageLoopForUI message_loop;
UIShell shell(&message_loop);
« no previous file with comments | « athena/main/athena_main.gyp ('k') | athena/test/athena_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698