Splits ash_test_resources_100_percent into two pak files

ash/test/test_suite.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/test_suite.h"
 
 #include "ash/common/ash_switches.h"
+#include "ash/test/ash_test_environment.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/env.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/gfx_paths.h"
@@ skipping 33 matching lines @@
 
   // Force unittests to run using en-US so if we test against string output,
   // it'll pass regardless of the system language.
   base::i18n::SetICUDefaultLocale("en_US");
 
   // Load ash test resources and en-US strings; not 'common' (Chrome) resources.
   base::FilePath path;
   PathService::Get(base::DIR_MODULE, &path);
   base::FilePath ash_test_strings =
       path.Append(FILE_PATH_LITERAL("ash_test_strings.pak"));
-  base::FilePath ash_test_resources_100 =
-      path.Append(FILE_PATH_LITERAL("ash_test_resources_100_percent.pak"));
-  base::FilePath ash_test_resources_200 =
-      path.Append(FILE_PATH_LITERAL("ash_test_resources_200_percent.pak"));
+  ui::ResourceBundle::InitSharedInstanceWithPakPath(ash_test_strings);
 
-  ui::ResourceBundle::InitSharedInstanceWithPakPath(ash_test_strings);
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_100P))
-    rb.AddDataPackFromPath(ash_test_resources_100, ui::SCALE_FACTOR_100P);
-  if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_200P))
-    rb.AddDataPackFromPath(ash_test_resources_200, ui::SCALE_FACTOR_200P);
+  if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_100P)) {
+    base::FilePath ash_test_resources_100 =
+        path.AppendASCII(AshTestEnvironment::Get100PercentResourceFileName());
+    ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+        ash_test_resources_100, ui::SCALE_FACTOR_100P);
+  }
+  if (ui::ResourceBundle::IsScaleFactorSupported(ui::SCALE_FACTOR_200P)) {
+    base::FilePath ash_test_resources_200 =
+        path.Append(FILE_PATH_LITERAL("ash_test_resources_200_percent.pak"));
+    ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+        ash_test_resources_200, ui::SCALE_FACTOR_200P);
+  }
 
   base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_);
   env_ = aura::Env::CreateInstance();
 }
 
 void AuraShellTestSuite::Shutdown() {
   env_.reset();
   ui::ResourceBundle::CleanupSharedInstance();
 #if defined(OS_WIN)
   com_initializer_.reset();
 #endif
   base::TestSuite::Shutdown();
 }
 
 }  // namespace test
 }  // namespace ash