Fixing an AttachmentBroker problem which broke the windows host

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 84 matching lines @@
   input_task_runner_ = nullptr;
   desktop_environment_factory_.reset();
 }
 
 bool DesktopProcess::Start(
     std::unique_ptr<DesktopEnvironmentFactory> desktop_environment_factory) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
   DCHECK(!desktop_environment_factory_);
   DCHECK(desktop_environment_factory);
 
+  IPC::AttachmentBrokerUnprivileged::CreateBrokerIfNeeded();
+
   desktop_environment_factory_ = std::move(desktop_environment_factory);
 
   // Launch the audio capturing thread.
   scoped_refptr<AutoThreadTaskRunner> audio_task_runner;
 #if defined(OS_WIN)
   // On Windows the AudioCapturer requires COM, so we run a single-threaded
   // apartment, which requires a UI thread.
   audio_task_runner =
       AutoThread::CreateWithLoopAndComInitTypes("ChromotingAudioThread",
                                                 caller_task_runner_,
@@ skipping 19 matching lines @@
   if (!desktop_agent_->Start(AsWeakPtr(), &desktop_pipe)) {
     desktop_agent_ = nullptr;
     caller_task_runner_ = nullptr;
     input_task_runner_ = nullptr;
     desktop_environment_factory_.reset();
     return false;
   }
 
   // Connect to the daemon.
   daemon_channel_.reset(new IPC::ChannelProxy(this, io_task_runner.get()));
-  IPC::AttachmentBrokerUnprivileged::CreateBrokerIfNeeded();
   IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();
-  if (broker && !broker->IsPrivilegedBroker())
+  if (broker && !broker->IsPrivilegedBroker()) {
     broker->RegisterBrokerCommunicationChannel(daemon_channel_.get());
-  daemon_channel_->Init(daemon_channel_name_, IPC::Channel::MODE_CLIENT, true);
+  }
+  daemon_channel_->Init(daemon_channel_name_, IPC::Channel::MODE_CLIENT,
+                        /*create_pipe_now=*/true);
 
   // 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