Revert of Clean up public interface of AttachmentBrokerUnprivileged.

remoting/host/desktop_process.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.
 //
 // This file implements the Windows service controlling Me2Me host processes
 // running within user sessions.
 
 #include "remoting/host/desktop_process.h"
 
 #include <utility>
@@ skipping 64 matching lines @@
 }
 
 void DesktopProcess::OnChannelConnected(int32_t peer_pid) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   VLOG(1) << "IPC: desktop <- daemon (" << peer_pid << ")";
 }
 
 void DesktopProcess::OnChannelError() {
   // Shutdown the desktop process.
-  IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();
-  if (broker && !broker->IsPrivilegedBroker())
-    broker->DeregisterBrokerCommunicationChannel(daemon_channel_.get());
   daemon_channel_.reset();
   if (desktop_agent_.get()) {
     desktop_agent_->Stop();
     desktop_agent_ = nullptr;
   }
 
   caller_task_runner_ = nullptr;
   input_task_runner_ = nullptr;
   desktop_environment_factory_.reset();
 }
@@ skipping 39 matching lines @@
     input_task_runner_ = nullptr;
     desktop_environment_factory_.reset();
     return false;
   }
 
   // Connect to the daemon.
   daemon_channel_ =
       IPC::ChannelProxy::Create(daemon_channel_name_, IPC::Channel::MODE_CLIENT,
                                 this, io_task_runner.get());
 
-  IPC::AttachmentBrokerUnprivileged::CreateBrokerIfNeeded();
-  IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();
-  if (broker && !broker->IsPrivilegedBroker())
-    broker->RegisterBrokerCommunicationChannel(daemon_channel_.get());
+  // Attachment broker may be already created in tests.
+  if (!IPC::AttachmentBroker::GetGlobal())
+    attachment_broker_ = IPC::AttachmentBrokerUnprivileged::CreateBroker();
+
+  if (attachment_broker_) {
+    attachment_broker_->DesignateBrokerCommunicationChannel(
+        daemon_channel_.get());
+  }
 
   // Pass |desktop_pipe| to the daemon.
   daemon_channel_->Send(
       new ChromotingDesktopDaemonMsg_DesktopAttached(desktop_pipe));
 
   return true;
 }
 
 void DesktopProcess::OnCrash(const std::string& function_name,
                              const std::string& file_name,
                              const int& line_number) {
   char message[1024];
   base::snprintf(message, sizeof(message),
                  "Requested by %s at %s, line %d.",
                  function_name.c_str(), file_name.c_str(), line_number);
   base::debug::Alias(message);
 
   // The daemon requested us to crash the process.
   CHECK(false) << message;
 }
 
 } // namespace remoting