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

Unified Diff: mash/test/mash_test_suite.cc

Issue 2148363003: mash: Cleanup ash test strings and resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup patch Created 4 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 | « ash/test/test_suite.cc ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/test/mash_test_suite.cc
diff --git a/mash/test/mash_test_suite.cc b/mash/test/mash_test_suite.cc
index fa8a6367dd52d63923819da8c8180aadfb479bcc..98e0f1b8d236308a6ca8543952c57eb833921d6d 100644
--- a/mash/test/mash_test_suite.cc
+++ b/mash/test/mash_test_suite.cc
@@ -20,14 +20,11 @@ MashTestSuite::~MashTestSuite() {}
void MashTestSuite::Initialize() {
base::TestSuite::Initialize();
- // Load ash resources and en-US strings; not 'common' (Chrome) resources.
- // TODO(msw): Check ResourceBundle::IsScaleFactorSupported; load 300% etc.
- base::FilePath path;
- PathService::Get(base::DIR_MODULE, &path);
- base::FilePath mash_test_strings =
- path.Append(FILE_PATH_LITERAL("ash_mus_resources.pak"));
-
- ui::ResourceBundle::InitSharedInstanceWithPakPath(mash_test_strings);
+ // Load ash mus strings and resources; not 'common' (Chrome) resources.
+ base::FilePath resources;
+ PathService::Get(base::DIR_MODULE, &resources);
+ resources = resources.Append(FILE_PATH_LITERAL("ash_mus_resources.pak"));
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(resources);
base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_);
env_ = aura::Env::CreateInstance();
« no previous file with comments | « ash/test/test_suite.cc ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698