resources: Prevent including the same resource in multiple pack files.

components/test/run_all_unittests.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 "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
@@ skipping 43 matching lines @@
 #endif
 
     ui::RegisterPathProvider();
 
     base::FilePath pak_path;
 #if defined(OS_ANDROID)
     PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
 #else
     PathService::Get(base::DIR_MODULE, &pak_path);
 #endif
+
+#if defined(OS_IOS) || defined(OS_ANDROID)

[blundell, 2015/05/07 08:25:43]

Why is the loading of the ui test pak conditional on the OS here? That doesn't
seem to match up with how it was working before, unless I'm missing something in
the build files.

[sadrul, 2015/05/07 08:46:14]

I tried unconditionally loading ui test pak in patchset 5, but could not grok
the failures on ios/android trybots. I have sent out another set of tries with
this removed (patchset 15), but the components_unittests failure on ios still
isn't particularly helpful
(http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...).
I can dig into this a bit more if there's some way to symbolize the backtraces
from the crashes?

     ui::ResourceBundle::InitSharedInstanceWithPakPath(
         pak_path.AppendASCII("components_tests_resources.pak"));
+#else
+    base::FilePath ui_test_pak_path;
+    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+
+    ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+        pak_path.AppendASCII("components_tests_resources.pak"),
+        ui::SCALE_FACTOR_NONE);
+#endif
 
     // These schemes need to be added globally to pass tests of
     // autocomplete_input_unittest.cc and content_settings_pattern*
     url::AddStandardScheme("chrome");
     url::AddStandardScheme("chrome-extension");
     url::AddStandardScheme("chrome-devtools");
     url::AddStandardScheme("chrome-search");
 
     // Not using kExtensionScheme to avoid the dependency to extensions.
     ContentSettingsPattern::SetNonWildcardDomainNonPortScheme(
@@ skipping 36 matching lines @@
   // The listener will set up common test environment for all components unit
   // tests.
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new ComponentsUnitTestEventListener());
 
   return base::LaunchUnitTests(
       argc, argv, base::Bind(&base::TestSuite::Run,
                              base::Unretained(&test_suite)));
 }