[ui][android] Remove exception for test DataPack loading errors.

Bug: 1078365
Change-Id: Ic1ebe2dea07d3329e6e66b243ea3261ee3c2a289
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2309695
Auto-Submit: Wez <wez@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791351}

chrome/browser/android/vr/test/ar_test_suite.cc

@@ -6,8 +6,8 @@
 
 #include <memory>
 
+#include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "base/path_service.h"
 #include "base/test/task_environment.h"
 #include "build/build_config.h"
 #include "mojo/core/embedder/embedder.h"
@@ -28,11 +28,8 @@ void ArTestSuite::Initialize() {
 
   mojo::core::Init();
 
-  base::FilePath pak_path;
   ui::RegisterPathProvider();
-  base::PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
-  ui::ResourceBundle::InitSharedInstanceWithPakPath(
-      pak_path.AppendASCII("vr_test.pak"));
+  ui::ResourceBundle::InitSharedInstanceWithPakPath(base::FilePath());
 }
 
 void ArTestSuite::Shutdown() {

ui/android/run_all_unittests.cc

@@ -5,8 +5,8 @@
 #include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
+#include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -25,9 +25,7 @@ class UIAndroidTestSuite : public base::TestSuite {
 
     ui::RegisterPathProvider();
 
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(base::PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(base::FilePath());
   }
 
   void Shutdown() override {

ui/base/resource/resource_bundle.cc

@@ -461,14 +461,8 @@ void ResourceBundle::LoadTestResources(const base::FilePath& path,
   if (!path.empty()) {
     const ScaleFactor scale_factor(ui::GetSupportedScaleFactors()[0]);
     auto data_pack = std::make_unique<DataPack>(scale_factor);
-#if defined(OS_ANDROID)
-    // TODO(https://crbug.com/1078365): Fix Android and remove this conditional.
-    if (data_pack->LoadFromPath(path))
-      AddDataPack(std::move(data_pack));
-#else   // !defined(OS_ANDROID)
     CHECK(data_pack->LoadFromPath(path));
     AddDataPack(std::move(data_pack));
-#endif  // !define(OS_ANDROID)
   }
 
   auto data_pack = std::make_unique<DataPack>(ui::SCALE_FACTOR_NONE);