| Index: ui/views/mus/platform_test_helper_mus.cc
|
| diff --git a/ui/views/mus/platform_test_helper_mus.cc b/ui/views/mus/platform_test_helper_mus.cc
|
| index 67d57cab72244ef192c3c9bf76981aaea027175f..bffdbc6a6eff1b122d06b100f8102a6123e1ab92 100644
|
| --- a/ui/views/mus/platform_test_helper_mus.cc
|
| +++ b/ui/views/mus/platform_test_helper_mus.cc
|
| @@ -20,7 +20,7 @@ using shell::BackgroundShell;
|
| namespace views {
|
| namespace {
|
|
|
| -const char kTestName[] = "mojo:test-app";
|
| +const char kTestName[] = "exe:views_mus_unittests";
|
|
|
| class DefaultShellClient : public shell::ShellClient {
|
| public:
|
| @@ -31,20 +31,11 @@ class DefaultShellClient : public shell::ShellClient {
|
| DISALLOW_COPY_AND_ASSIGN(DefaultShellClient);
|
| };
|
|
|
| -std::unique_ptr<shell::TestCatalogStore> BuildTestCatalogStore() {
|
| - std::unique_ptr<base::ListValue> apps(new base::ListValue);
|
| - apps->Append(shell::BuildPermissiveSerializedAppInfo(kTestName, "test"));
|
| - return base::WrapUnique(new shell::TestCatalogStore(std::move(apps)));
|
| -}
|
| -
|
| class PlatformTestHelperMus : public PlatformTestHelper {
|
| public:
|
| PlatformTestHelperMus() {
|
| background_shell_.reset(new BackgroundShell);
|
| - std::unique_ptr<BackgroundShell::InitParams> init_params(
|
| - new BackgroundShell::InitParams);
|
| - init_params->catalog_store = BuildTestCatalogStore();
|
| - background_shell_->Init(std::move(init_params));
|
| + background_shell_->Init(nullptr);
|
| shell_client_.reset(new DefaultShellClient);
|
| shell_connection_.reset(new shell::ShellConnection(
|
| shell_client_.get(),
|
|
|