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

Unified Diff: athena/test/athena_unittests.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_shell.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/test/athena_unittests.cc
diff --git a/athena/test/athena_unittests.cc b/athena/test/athena_unittests.cc
index bdb6b73506e45eeb31d00149e68cf57f918c760d..4c5108ba8b3fd0c2f58a629a7fff5db2711692f3 100644
--- a/athena/test/athena_unittests.cc
+++ b/athena/test/athena_unittests.cc
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/base_paths.h"
#include "base/bind.h"
#include "base/macros.h"
+#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"
@@ -27,9 +29,10 @@ class AthenaTestSuite : public base::TestSuite {
gfx::RegisterPathProvider();
ui::RegisterPathProvider();
- // Force unittests to run using en-US so if we test against string
- // output, it'll pass regardless of the system language.
- ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+ base::FilePath test_pak_path;
+ ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &test_pak_path));
+ test_pak_path = test_pak_path.AppendASCII("athena_resources.pak");
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(test_pak_path);
}
virtual void Shutdown() OVERRIDE {
ui::ResourceBundle::CleanupSharedInstance();
« no previous file with comments | « athena/main/athena_shell.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698