ipc: Move AttachmentBrokerPrivileged singleton logic into ipc/.

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"
 #include "base/files/file_path.h"
 #include "base/hash.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/numerics/safe_math.h"
 #include "base/path_service.h"
 #include "base/process/process_metrics.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"
 #include "content/public/common/child_process_host_delegate.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/attachment_broker.h"
+#include "ipc/attachment_broker_privileged.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/message_filter.h"
 
 #if defined(OS_LINUX)
 #include "base/linux_util.h"
 #elif defined(OS_WIN)
 #include "content/common/font_cache_dispatcher_win.h"
 #endif  // OS_LINUX
 
 namespace {
 
-#if USE_ATTACHMENT_BROKER
-// This class is wrapped in a singleton to ensure that its constructor is only
-// called once. The constructor creates an attachment broker and
-// sets it as the global broker.
-class AttachmentBrokerWrapper {
- public:
-  AttachmentBrokerWrapper() {
-    attachment_broker_.reset(
-        IPC::AttachmentBrokerPrivileged::CreateBroker().release());
-  }
-
-  IPC::AttachmentBrokerPrivileged* GetAttachmentBroker() {
-    return attachment_broker_.get();
-  }
-
- private:
-  scoped_ptr<IPC::AttachmentBrokerPrivileged> attachment_broker_;
-};
-
-base::LazyInstance<AttachmentBrokerWrapper>::Leaky
-    g_attachment_broker_wrapper = LAZY_INSTANCE_INITIALIZER;
-
-IPC::AttachmentBrokerPrivileged* GetAttachmentBroker() {
-  return g_attachment_broker_wrapper.Get().GetAttachmentBroker();
-}
-#endif  // USE_ATTACHMENT_BROKER
-
 // Global atomic to generate child process unique IDs.
 base::StaticAtomicSequenceNumber g_unique_id;
 
 }  // namespace
 
 namespace content {
 
 int ChildProcessHost::kInvalidUniqueID = -1;
 
 uint64 ChildProcessHost::kBrowserTracingProcessId =
@@ skipping 32 matching lines @@
     : delegate_(delegate),
       opening_channel_(false) {
 #if defined(OS_WIN)
   AddFilter(new FontCacheDispatcher());
 #endif
 #if USE_ATTACHMENT_BROKER
   // Construct the privileged attachment broker early in the life cycle of a
   // child process. This ensures that when a test is being run in one of the
   // single process modes, the global attachment broker is the privileged
   // attachment broker, rather than an unprivileged attachment broker.
-  GetAttachmentBroker();
+  IPC::AttachmentBrokerPrivileged::CreateBrokerIfNeeded();
 #endif
 }
 
 ChildProcessHostImpl::~ChildProcessHostImpl() {
 #if USE_ATTACHMENT_BROKER
   GetAttachmentBroker()->DeregisterCommunicationChannel(channel_.get());
 #endif
   for (size_t i = 0; i < filters_.size(); ++i) {
     filters_[i]->OnChannelClosing();
     filters_[i]->OnFilterRemoved();
@@ skipping 205 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