Rename shell namespace to service_manager

content/common/child_process_host_impl.cc

 // Copyright (c) 2012 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 "content/common/child_process_host_impl.h"
 
 #include <limits>
 
 #include "base/atomic_sequence_num.h"
 #include "base/command_line.h"
@@ skipping 113 matching lines @@
   }
 }
 
 void ChildProcessHostImpl::AddFilter(IPC::MessageFilter* filter) {
   filters_.push_back(filter);
 
   if (channel_)
     filter->OnFilterAdded(channel_.get());
 }
 
-shell::InterfaceProvider* ChildProcessHostImpl::GetRemoteInterfaces() {
+service_manager::InterfaceProvider*
+ChildProcessHostImpl::GetRemoteInterfaces() {
   return delegate_->GetRemoteInterfaces();
 }
 
 void ChildProcessHostImpl::ForceShutdown() {
   Send(new ChildProcessMsg_Shutdown());
 }
 
 std::string ChildProcessHostImpl::CreateChannelMojo(
     const std::string& child_token) {
   DCHECK(channel_id_.empty());
   channel_id_ = mojo::edk::GenerateRandomToken();
   mojo::ScopedMessagePipeHandle host_handle =
       mojo::edk::CreateParentMessagePipe(channel_id_, child_token);
   channel_ = IPC::ChannelMojo::Create(std::move(host_handle),
                                       IPC::Channel::MODE_SERVER, this);
   if (!channel_ || !InitChannel())
     return std::string();
 
   return channel_id_;
 }
 
 void ChildProcessHostImpl::CreateChannelMojo() {
   // TODO(rockot): Remove |channel_id_| once this is the only code path by which
   // the Channel is created. For now it serves to at least mutually exclude
   // different CreateChannel* calls.
   DCHECK(channel_id_.empty());
   channel_id_ = "ChannelMojo";
 
-  shell::InterfaceProvider* remote_interfaces = GetRemoteInterfaces();
+  service_manager::InterfaceProvider* remote_interfaces = GetRemoteInterfaces();
   DCHECK(remote_interfaces);
 
   IPC::mojom::ChannelBootstrapPtr bootstrap;
   remote_interfaces->GetInterface(&bootstrap);
   channel_ = IPC::ChannelMojo::Create(bootstrap.PassInterface().PassHandle(),
                                       IPC::Channel::MODE_SERVER, this);
   DCHECK(channel_);
 
   bool initialized = InitChannel();
   DCHECK(initialized);
@@ skipping 197 matching lines @@
 }
 
 void ChildProcessHostImpl::OnDeletedGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     const gpu::SyncToken& sync_token) {
   // Note: Nothing to do here as ownership of shared memory backed
   // GpuMemoryBuffers is passed with IPC.
 }
 
 }  // namespace content