Commit 3050dd24 authored by Wez's avatar Wez Committed by Commit Bot

[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: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791351}
parent eb4b8c64
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include <memory> #include <memory>
#include "base/files/file_path.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/test/task_environment.h" #include "base/test/task_environment.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "mojo/core/embedder/embedder.h" #include "mojo/core/embedder/embedder.h"
...@@ -28,11 +28,8 @@ void ArTestSuite::Initialize() { ...@@ -28,11 +28,8 @@ void ArTestSuite::Initialize() {
mojo::core::Init(); mojo::core::Init();
base::FilePath pak_path;
ui::RegisterPathProvider(); ui::RegisterPathProvider();
base::PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path); ui::ResourceBundle::InitSharedInstanceWithPakPath(base::FilePath());
ui::ResourceBundle::InitSharedInstanceWithPakPath(
pak_path.AppendASCII("vr_test.pak"));
} }
void ArTestSuite::Shutdown() { void ArTestSuite::Shutdown() {
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include "base/android/jni_android.h" #include "base/android/jni_android.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h" #include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h" #include "base/test/test_suite.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -25,9 +25,7 @@ class UIAndroidTestSuite : public base::TestSuite { ...@@ -25,9 +25,7 @@ class UIAndroidTestSuite : public base::TestSuite {
ui::RegisterPathProvider(); ui::RegisterPathProvider();
base::FilePath ui_test_pak_path; ui::ResourceBundle::InitSharedInstanceWithPakPath(base::FilePath());
ASSERT_TRUE(base::PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
} }
void Shutdown() override { void Shutdown() override {
......
...@@ -461,14 +461,8 @@ void ResourceBundle::LoadTestResources(const base::FilePath& path, ...@@ -461,14 +461,8 @@ void ResourceBundle::LoadTestResources(const base::FilePath& path,
if (!path.empty()) { if (!path.empty()) {
const ScaleFactor scale_factor(ui::GetSupportedScaleFactors()[0]); const ScaleFactor scale_factor(ui::GetSupportedScaleFactors()[0]);
auto data_pack = std::make_unique<DataPack>(scale_factor); 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)); CHECK(data_pack->LoadFromPath(path));
AddDataPack(std::move(data_pack)); AddDataPack(std::move(data_pack));
#endif // !define(OS_ANDROID)
} }
auto data_pack = std::make_unique<DataPack>(ui::SCALE_FACTOR_NONE); auto data_pack = std::make_unique<DataPack>(ui::SCALE_FACTOR_NONE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment