ui: Make views_unittests not depend on chrome's packed_resources target.

Depending on chrome's target is a layer violation, so we should break that dependency. BUG=299841,176960,144345 TEST=views_unittests R=tony@chromium.org Review URL: https://codereview.chromium.org/45753004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234537 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Nov 12, 2013 · 33bf302 · 33bf302
1 parent 5f817bf
commit 33bf302
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 9 deletions.
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
@@ -289,17 +289,15 @@ std::string ResourceBundle::LoadLocaleResources(
 void ResourceBundle::LoadTestResources(const base::FilePath& path,
                                        const base::FilePath& locale_path) {
   // Use the given resource pak for both common and localized resources.
-  scoped_ptr<DataPack> data_pack(
-      new DataPack(SCALE_FACTOR_100P));
+  scoped_ptr<DataPack> data_pack(new DataPack(SCALE_FACTOR_100P));
   if (!path.empty() && data_pack->LoadFromPath(path))
     AddDataPack(data_pack.release());
 
   data_pack.reset(new DataPack(ui::SCALE_FACTOR_NONE));
   if (!locale_path.empty() && data_pack->LoadFromPath(locale_path)) {
     locale_resources_data_.reset(data_pack.release());
   } else {
-    locale_resources_data_.reset(
-        new DataPack(ui::SCALE_FACTOR_NONE));
+    locale_resources_data_.reset(new DataPack(ui::SCALE_FACTOR_NONE));
   }
 }
 

diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi
@@ -35,5 +35,39 @@
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
+    {
+      # We build a minimal set of resources so WebKit in content_shell has
+      # access to necessary resources.
+      'target_name': 'ui_test_pak',
+      'type': 'none',
+      'dependencies': [
+        'base/strings/ui_strings.gyp:ui_strings',
+        'ui_resources',
+      ],
+      'variables': {
+        'repack_path': '../tools/grit/grit/format/repack.py',
+      },
+      'actions': [
+        {
+          'action_name': 'repack_ui_test_pack',
+          'variables': {
+            'pak_inputs': [
+              '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
+            ],
+          },
+          'inputs': [
+            '<(repack_path)',
+            '<@(pak_inputs)',
+          ],
+          'outputs': [
+            '<(PRODUCT_DIR)/ui_test.pak',
+          ],
+          'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+        },
+      ],
+    },
   ],
 }
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc
@@ -5,6 +5,7 @@
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
+#include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -19,7 +20,14 @@ class ViewTestSuite : public base::TestSuite {
   virtual void Initialize() OVERRIDE {
     base::TestSuite::Initialize();
     ui::RegisterPathProvider();
-    ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
   }
 
  private:

diff --git a/ui/views/views.gyp b/ui/views/views.gyp
@@ -702,10 +702,6 @@
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../base/base.gyp:test_support_base',
-        # TODO(jcivelli): ideally the resource needed by views would be
-        #                 factored out. (for some reason it pulls in a bunch
-        #                 unrelated things like v8, sqlite nss...).
-        '../../chrome/chrome_resources.gyp:packed_resources',
         '../../skia/skia.gyp:skia',
         '../../testing/gmock.gyp:gmock',
         '../../testing/gtest.gyp:gtest',
@@ -719,6 +715,7 @@
         '../gfx/gfx.gyp:gfx',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
+        '../ui.gyp:ui_test_pak',
         '../ui_unittests.gyp:ui_test_support',
         'views',
         'views_test_support',