Update contents to use attachment broker.

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 131 matching lines @@
     // intolerant of a non-executable heap to work properly on 10.7. This
     // results in Chromium Helper EH.app or Google Chrome Helper EH.app.
     child_path = TransformPathForFeature(child_path, "EH");
   }
 #endif
 
   return child_path;
 }
 
 // static
-IPC::AttachmentBroker* ChildProcessHost::GetAttachmentBroker() {
-#if defined(OS_WIN)
+IPC::AttachmentBrokerPrivileged* ChildProcessHost::GetAttachmentBroker() {
+#if USE_ATTACHMENT_BROKER
   return &g_attachment_broker.Get();
 #else
   return nullptr;
-#endif  // defined(OS_WIN)
+#endif  // USE_ATTACHMENT_BROKER
 }
 
 ChildProcessHostImpl::ChildProcessHostImpl(ChildProcessHostDelegate* delegate)
     : delegate_(delegate),
       opening_channel_(false) {
 #if defined(OS_WIN)
   AddFilter(new FontCacheDispatcher());
 #endif
 }
 
 ChildProcessHostImpl::~ChildProcessHostImpl() {
+#if USE_ATTACHMENT_BROKER
+  g_attachment_broker.Get().DeregisterCommunicationChannel(channel_.get());
+#endif
   for (size_t i = 0; i < filters_.size(); ++i) {
     filters_[i]->OnChannelClosing();
     filters_[i]->OnFilterRemoved();
   }
 }
 
 void ChildProcessHostImpl::AddFilter(IPC::MessageFilter* filter) {
   filters_.push_back(filter);
 
   if (channel_)
     filter->OnFilterAdded(channel_.get());
 }
 
 void ChildProcessHostImpl::ForceShutdown() {
   Send(new ChildProcessMsg_Shutdown());
 }
 
 std::string ChildProcessHostImpl::CreateChannel() {
   channel_id_ = IPC::Channel::GenerateVerifiedChannelID(std::string());
   channel_ =
       IPC::Channel::CreateServer(channel_id_, this, GetAttachmentBroker());
   if (!channel_->Connect())
     return std::string();
+#if USE_ATTACHMENT_BROKER
+  g_attachment_broker.Get().RegisterCommunicationChannel(channel_.get());
+#endif
 
   for (size_t i = 0; i < filters_.size(); ++i)
     filters_[i]->OnFilterAdded(channel_.get());
 
   // Make sure these messages get sent first.
 #if defined(IPC_MESSAGE_LOG_ENABLED)
   bool enabled = IPC::Logging::GetInstance()->Enabled();
   Send(new ChildProcessMsg_SetIPCLoggingEnabled(enabled));
 #endif
 
@@ skipping 70 matching lines @@
   IPC::Logging* logger = IPC::Logging::GetInstance();
   if (msg.type() == IPC_LOGGING_ID) {
     logger->OnReceivedLoggingMessage(msg);
     return true;
   }
 
   if (logger->Enabled())
     logger->OnPreDispatchMessage(msg);
 #endif
 
+#if USE_ATTACHMENT_BROKER
+  if (g_attachment_broker.Get().OnMessageReceived(msg))
+    return true;
+#endif
+
   bool handled = false;
   for (size_t i = 0; i < filters_.size(); ++i) {
     if (filters_[i]->OnMessageReceived(msg)) {
       handled = true;
       break;
     }
   }
 
   if (!handled) {
     handled = true;
@@ skipping 79 matching lines @@
 }
 
 void ChildProcessHostImpl::OnDeletedGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     uint32 sync_point) {
   // Note: Nothing to do here as ownership of shared memory backed
   // GpuMemoryBuffers is passed with IPC.
 }
 
 }  // namespace content