Revert of Eliminate silently letting errors pass on pak loading.

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/memory/scoped_ptr.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
@@ skipping 64 matching lines @@
 
     base::mac::SetOverrideFrameworkBundlePath(path);
 #endif
 
     ui::RegisterPathProvider();
 
     // 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, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
-    base::FilePath resources_pack_dir;
-#if defined(OS_ANDROID)
-    PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &resources_pack_dir);
-#else
-    PathService::Get(base::DIR_MODULE, &resources_pack_dir);
-#endif
+    base::FilePath resources_pack_path;
+    PathService::Get(base::DIR_MODULE, &resources_pack_path);
     ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-        resources_pack_dir.AppendASCII("resources.pak"),
+        resources_pack_path.AppendASCII("resources.pak"),
         ui::SCALE_FACTOR_NONE);
 
     // 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.
@@ skipping 41 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)));
 }