Splits ash_test_resources_100_percent into two pak files
One depends upon content, the other doesn't. This way ash_unittests
doesn't depend upon anything in content.
BUG=641026
TEST=test only changes
[email protected]
Review-Url: https://codereview.chromium.org/2316803002
Cr-Commit-Position: refs/heads/master@{#416808}
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index eb28d27..33dedc1 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -5,6 +5,7 @@
#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"
@@ -58,17 +59,20 @@
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& 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();
