Revert of Clean up public interface of AttachmentBrokerUnprivileged.

ipc/attachment_broker_privileged.cc

 // Copyright 2015 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 "ipc/attachment_broker_privileged.h"
 
 #include <algorithm>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 49 matching lines @@
 #else
   return nullptr;
 #endif
 }
 
 // This class is wrapped in a LazyInstance to ensure that its constructor is
 // only called once. The constructor creates an attachment broker and sets it as
 // the global broker.
 class AttachmentBrokerMakeOnce {
  public:
-  AttachmentBrokerMakeOnce() : attachment_broker_(CreateBroker()) {}
+  AttachmentBrokerMakeOnce() {
+    attachment_broker_.reset(CreateBroker().release());
+  }
 
  private:
   scoped_ptr<IPC::AttachmentBrokerPrivileged> attachment_broker_;
 };
 
 base::LazyInstance<AttachmentBrokerMakeOnce>::Leaky
     g_attachment_broker_make_once = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
@@ skipping 38 matching lines @@
 }
 
 void AttachmentBrokerPrivileged::DeregisterCommunicationChannel(
     Endpoint* endpoint) {
   base::AutoLock auto_lock(*get_lock());
   auto it = std::find(endpoints_.begin(), endpoints_.end(), endpoint);
   if (it != endpoints_.end())
     endpoints_.erase(it);
 }
 
-bool AttachmentBrokerPrivileged::IsPrivilegedBroker() {
-  return true;
-}
-
 Sender* AttachmentBrokerPrivileged::GetSenderWithProcessId(base::ProcessId id) {
   get_lock()->AssertAcquired();
   auto it = std::find_if(endpoints_.begin(), endpoints_.end(),
                          [id](Endpoint* c) { return c->GetPeerPID() == id; });
   if (it == endpoints_.end())
     return nullptr;
   return *it;
 }
 
 void AttachmentBrokerPrivileged::LogError(UMAError error) {
   UMA_HISTOGRAM_ENUMERATION(
       "IPC.AttachmentBrokerPrivileged.BrokerAttachmentError", error, ERROR_MAX);
 }
 
 }  // namespace IPC