Eliminate components_unittests' dependence on chrome resources.

components/test/run_all_unittests.cc

Index: components/test/run_all_unittests.cc
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
index 0e6dafa6027e48cac821939a3a6b511ac426aa41..3d893433199b3de1e6e22b34b189f77f496fcf96 100644
--- a/components/test/run_all_unittests.cc
+++ b/components/test/run_all_unittests.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
@@ -12,10 +13,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
-#if defined(OS_MACOSX)
-#include "base/mac/bundle_locations.h"
-#endif
-
 #if !defined(OS_IOS)
 #include "ui/gl/gl_surface.h"
 #endif
@@ -45,45 +42,15 @@ class ComponentsTestSuite : public base::TestSuite {
     ui::android::RegisterJni(env);
 #endif
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
-    // Look in the framework bundle for resources.
-    base::FilePath path;
-    PathService::Get(base::DIR_EXE, &path);
-
-    // TODO(tfarina): This is temporary. The right fix is to write a
-    // framework-Info.plist and integrate that into the build.
-    // Hardcode the framework name here to avoid having to depend on chrome's
-    // common target for chrome::kFrameworkName.
-#if defined(GOOGLE_CHROME_BUILD)
-    path = path.AppendASCII("Google Chrome Framework.framework");
-#elif defined(CHROMIUM_BUILD)
-    path = path.AppendASCII("Chromium Framework.framework");
-#else
-#error Unknown branding
-#endif
-
-    base::mac::SetOverrideFrameworkBundlePath(path);
-#endif
-
-    ui::RegisterPathProvider();

[tfarina, 2014/04/29 16:00:38]

are you sure this can go away? Last time I looked this, we were using some enum
constants from ui_base_paths.h. If it can go away, can we remove the
ui_base_paths.h include?

-
-    // TODO(tfarina): This should be changed to InitSharedInstanceWithPakFile()
-    // so we can load our pak file instead of chrome.pak. crbug.com/348563
-    ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
     base::FilePath resources_pack_path;
     PathService::Get(base::DIR_MODULE, &resources_pack_path);
-    ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-        resources_pack_path.AppendASCII("resources.pak"),
-        ui::SCALE_FACTOR_NONE);
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(
+        resources_pack_path.AppendASCII("components_unittests_resources.pak"));
   }
 
   virtual void Shutdown() OVERRIDE {
     ui::ResourceBundle::CleanupSharedInstance();
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
-  base::mac::SetOverrideFrameworkBundle(NULL);
-#endif
-
     base::TestSuite::Shutdown();
   }