Move shell service to toplevel shell namespace

media/mojo/services/mojo_media_application.cc

 // Copyright 2014 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 "media/mojo/services/mojo_media_application.h"
 
 #include <utility>
 
 #include "media/base/media_log.h"
 #include "media/mojo/services/mojo_media_client.h"
 #include "media/mojo/services/service_factory_impl.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 
 namespace media {
 
 // TODO(xhwang): Hook up MediaLog when possible.
 MojoMediaApplication::MojoMediaApplication(
     std::unique_ptr<MojoMediaClient> mojo_media_client)
     : mojo_media_client_(std::move(mojo_media_client)),
       connector_(nullptr),
       media_log_(new MediaLog()) {
   DCHECK(mojo_media_client_);
 }
 
 MojoMediaApplication::~MojoMediaApplication() {}
 
-void MojoMediaApplication::Initialize(mojo::Connector* connector,
-                                      const mojo::Identity& identity,
+void MojoMediaApplication::Initialize(shell::Connector* connector,
+                                      const shell::Identity& identity,
                                       uint32_t /* id */) {
   connector_ = connector;
   mojo_media_client_->Initialize();
 }
 
-bool MojoMediaApplication::AcceptConnection(mojo::Connection* connection) {
+bool MojoMediaApplication::AcceptConnection(shell::Connection* connection) {
   connection->AddInterface<interfaces::ServiceFactory>(this);
   return true;
 }
 
 void MojoMediaApplication::Create(
-    mojo::Connection* connection,
+    shell::Connection* connection,
     mojo::InterfaceRequest<interfaces::ServiceFactory> request) {
   // The created object is owned by the pipe.
   new ServiceFactoryImpl(std::move(request), connection->GetRemoteInterfaces(),
                          media_log_, ref_factory_.CreateRef(),
                          mojo_media_client_.get());
 }
 
 }  // namespace media