Move shell service to toplevel shell namespace

ui/views/mus/platform_test_helper_mus.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 "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "services/shell/background/background_shell.h"
 #include "services/shell/background/tests/test_catalog_store.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/cpp/shell_connection.h"
 #include "ui/aura/env.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/test/platform_test_helper.h"
 #include "ui/views/views_delegate.h"
 
-using mojo::shell::BackgroundShell;
+using shell::BackgroundShell;
 
 namespace views {
 namespace {
 
 const char kTestName[] = "mojo:test-app";
 
-class DefaultShellClient : public mojo::ShellClient {
+class DefaultShellClient : public shell::ShellClient {
  public:
   DefaultShellClient() {}
   ~DefaultShellClient() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultShellClient);
 };
 
-std::unique_ptr<mojo::shell::TestCatalogStore> BuildTestCatalogStore() {
+std::unique_ptr<shell::TestCatalogStore> BuildTestCatalogStore() {
   std::unique_ptr<base::ListValue> apps(new base::ListValue);
-  apps->Append(
-      mojo::shell::BuildPermissiveSerializedAppInfo(kTestName, "test"));
-  return base::WrapUnique(new mojo::shell::TestCatalogStore(std::move(apps)));
+  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));
     shell_client_.reset(new DefaultShellClient);
-    shell_connection_.reset(new mojo::ShellConnection(
+    shell_connection_.reset(new shell::ShellConnection(
         shell_client_.get(),
         background_shell_->CreateShellClientRequest(kTestName)));
 
     // TODO(rockot): Remove this RunLoop. http://crbug.com/594852.
     base::RunLoop wait_loop;
     shell_connection_->set_initialize_handler(wait_loop.QuitClosure());
     wait_loop.Run();
 
     // ui/views/mus requires a WindowManager running, for now use the desktop
     // one.
-    mojo::Connector* connector = shell_connection_->connector();
+    shell::Connector* connector = shell_connection_->connector();
     connector->Connect("mojo:desktop_wm");
     WindowManagerConnection::Create(connector);
 
     // On X we need to reset the ContextFactory before every NativeWidgetMus
     // is created.
     // TODO(sad): this is a hack, figure out a better solution.
     ViewsDelegate::GetInstance()->set_native_widget_factory(base::Bind(
         &PlatformTestHelperMus::CreateNativeWidgetMus, base::Unretained(this),
         std::map<std::string, std::vector<uint8_t>>()));
   }
@@ skipping 14 matching lines @@
     ui::ContextFactory* factory = aura::Env::GetInstance()->context_factory();
     aura::Env::GetInstance()->set_context_factory(nullptr);
     NativeWidget* result =
         WindowManagerConnection::Get()->CreateNativeWidgetMus(
             props, init_params, delegate);
     aura::Env::GetInstance()->set_context_factory(factory);
     return result;
   }
 
   std::unique_ptr<BackgroundShell> background_shell_;
-  std::unique_ptr<mojo::ShellConnection> shell_connection_;
+  std::unique_ptr<shell::ShellConnection> shell_connection_;
   std::unique_ptr<DefaultShellClient> shell_client_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformTestHelperMus);
 };
 
 }  // namespace
 
 // static
 std::unique_ptr<PlatformTestHelper> PlatformTestHelper::Create() {
   return base::WrapUnique(new PlatformTestHelperMus);
 }
 
 }  // namespace views