diff options
| author | ben <ben@chromium.org> | 2016-03-08 20:08:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-09 04:09:07 +0000 |
| commit | c18f9cc14a916cf131b6cb8f001e469d0a26de43 (patch) | |
| tree | 9d2b0e50d2c344ac144818357ae9a5136c59dd5a /ui/views/mus/platform_test_helper_mus.cc | |
| parent | f7a51f72543e18c667a45178d97cbab5337bcc45 (diff) | |
| download | chromium_src-c18f9cc14a916cf131b6cb8f001e469d0a26de43.zip chromium_src-c18f9cc14a916cf131b6cb8f001e469d0a26de43.tar.gz chromium_src-c18f9cc14a916cf131b6cb8f001e469d0a26de43.tar.bz2 | |
Rename PackageManager->Catalog.
TBR=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1775243002
Cr-Commit-Position: refs/heads/master@{#380062}
Diffstat (limited to 'ui/views/mus/platform_test_helper_mus.cc')
| -rw-r--r-- | ui/views/mus/platform_test_helper_mus.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ui/views/mus/platform_test_helper_mus.cc b/ui/views/mus/platform_test_helper_mus.cc index 891bd6a..09c0110 100644 --- a/ui/views/mus/platform_test_helper_mus.cc +++ b/ui/views/mus/platform_test_helper_mus.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "mojo/shell/background/background_shell.h" -#include "mojo/shell/background/tests/test_application_catalog_store.h" +#include "mojo/shell/background/tests/test_catalog_store.h" #include "mojo/shell/public/cpp/connector.h" #include "mojo/shell/public/cpp/shell_client.h" #include "mojo/shell/public/cpp/shell_connection.h" @@ -28,13 +28,11 @@ class DefaultShellClient : public mojo::ShellClient { DISALLOW_COPY_AND_ASSIGN(DefaultShellClient); }; -scoped_ptr<mojo::shell::TestApplicationCatalogStore> -BuildTestApplicationCatalogStore() { +scoped_ptr<mojo::shell::TestCatalogStore> BuildTestCatalogStore() { scoped_ptr<base::ListValue> apps(new base::ListValue); apps->Append( mojo::shell::BuildPermissiveSerializedAppInfo(kTestName, "test")); - return make_scoped_ptr( - new mojo::shell::TestApplicationCatalogStore(std::move(apps))); + return make_scoped_ptr(new mojo::shell::TestCatalogStore(std::move(apps))); } class PlatformTestHelperMus : public PlatformTestHelper { @@ -43,7 +41,7 @@ class PlatformTestHelperMus : public PlatformTestHelper { background_shell_.reset(new BackgroundShell); scoped_ptr<BackgroundShell::InitParams> init_params( new BackgroundShell::InitParams); - init_params->app_catalog = BuildTestApplicationCatalogStore(); + init_params->catalog_store = BuildTestCatalogStore(); background_shell_->Init(std::move(init_params)); shell_client_.reset(new DefaultShellClient); shell_connection_.reset(new mojo::ShellConnection( |