mash: Cleanup ash test strings and resources.

ash/shell/content/client/shell_main_delegate.cc

Index: ash/shell/content/client/shell_main_delegate.cc
diff --git a/ash/shell/content/client/shell_main_delegate.cc b/ash/shell/content/client/shell_main_delegate.cc
index 4b4a21d4fe05d7b7793a9e84829137b6cd151ae9..e984b982aa6d7f48b975e8cecab4c3d9f5131e18 100644
--- a/ash/shell/content/client/shell_main_delegate.cc
+++ b/ash/shell/content/client/shell_main_delegate.cc
@@ -41,8 +41,7 @@ content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
 }
 
 void ShellMainDelegate::InitializeResourceBundle() {
-  // Load ash resources and en-US strings; not 'common' (Chrome) resources.
-  // TODO(msw): Check ResourceBundle::IsScaleFactorSupported; load 300% etc.
+  // Load ash resources and strings; not 'common' (Chrome) resources.
   base::FilePath path;
   PathService::Get(base::DIR_MODULE, &path);
   base::FilePath ash_test_strings =
@@ -54,8 +53,10 @@ void ShellMainDelegate::InitializeResourceBundle() {
 
   ui::ResourceBundle::InitSharedInstanceWithPakPath(ash_test_strings);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  rb.AddDataPackFromPath(ash_test_resources_100, ui::SCALE_FACTOR_100P);
-  rb.AddDataPackFromPath(ash_test_resources_200, ui::SCALE_FACTOR_200P);
+  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);
 }
 
 }  // namespace shell