Rename PackageManager->Catalog.

mojo/shell/background/background_shell.cc

 // Copyright 2016 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 "mojo/shell/background/background_shell.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "mojo/message_pump/message_pump_mojo.h"
-#include "mojo/services/package_manager/package_manager.h"
+#include "mojo/services/catalog/catalog.h"
 #include "mojo/shell/connect_params.h"
 #include "mojo/shell/loader.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/shell.h"
 #include "mojo/shell/standalone/context.h"
 
 namespace mojo {
 namespace shell {
 namespace {
@@ skipping 89 matching lines @@
 
     Context::EnsureEmbedderIsInitialized();
 
     message_loop_->BindToCurrentThread();
 
     scoped_ptr<Context> context(new Context);
     context_ = context.get();
     scoped_ptr<mojo::shell::Context::InitParams> context_init_params(
         new mojo::shell::Context::InitParams);
     if (init_params_) {
-      context_init_params->app_catalog = std::move(init_params_->app_catalog);
+      context_init_params->catalog_store =
+          std::move(init_params_->catalog_store);
       context_init_params->native_runner_delegate =
           init_params_->native_runner_delegate;
     }
     context_->Init(std::move(context_init_params));
 
     message_loop_->Run();
 
     // Has to happen after run, but while messageloop still valid.
     context_->Shutdown();
 
@@ skipping 49 matching lines @@
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE, base::Bind(&MojoThread::CreateShellClientRequest,
                             base::Unretained(thread_.get()), &signal,
                             base::Passed(&params), &request));
   signal.Wait();
   return request;
 }
 
 }  // namespace shell
 }  // namespace mojo