Remoting: Remove references to POSIX shared memory.

remoting/host/remoting_me2me_host.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 a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringize_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "ipc/attachment_broker_unprivileged.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"
 #include "net/base/net_util.h"
 #include "net/base/network_change_notifier.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/ssl_server_socket.h"
 #include "net/url_request/url_fetcher.h"
 #include "policy/policy_constants.h"
 #include "remoting/base/auto_thread_task_runner.h"
@@ skipping 275 matching lines @@
 
   // Crashes the process in response to a daemon's request. The daemon passes
   // the location of the code that detected the fatal error resulted in this
   // request.
   void OnCrash(const std::string& function_name,
                const std::string& file_name,
                const int& line_number);
 
   scoped_ptr<ChromotingHostContext> context_;
 
+  scoped_ptr<IPC::AttachmentBrokerUnprivileged> attachment_broker_;

[Sergey Ulanov, 2015/12/12 06:41:33]

Why do we need attachment broker now, but didn't need it before?

[erikchen, 2015/12/18 19:14:10]

An attachment broker is needed in each process that wants to send/receive mach
shared memory.

+
   // Accessed on the UI thread.
   scoped_ptr<IPC::ChannelProxy> daemon_channel_;
 
   // XMPP server/remoting bot configuration (initialized from the command line).
   XmppSignalStrategy::XmppServerConfig xmpp_server_config_;
   std::string directory_bot_jid_;
 
   // Created on the UI thread but used from the network thread.
   base::FilePath host_config_path_;
   std::string host_config_;
@@ skipping 70 matching lines @@
 
   ShutdownWatchdog* shutdown_watchdog_;
 
   DISALLOW_COPY_AND_ASSIGN(HostProcess);
 };
 
 HostProcess::HostProcess(scoped_ptr<ChromotingHostContext> context,
                          int* exit_code_out,
                          ShutdownWatchdog* shutdown_watchdog)
     : context_(context.Pass()),
+      attachment_broker_(IPC::AttachmentBrokerUnprivileged::CreateBroker()
+                             .release()),

[Sergey Ulanov, 2015/12/12 06:41:33]

don't need release() here

[erikchen, 2015/12/18 19:14:10]

Done.

       state_(HOST_STARTING),
       use_service_account_(false),
       enable_vp9_(false),
       frame_recorder_buffer_size_(0),
       policy_state_(POLICY_INITIALIZING),
       host_username_match_required_(false),
       allow_nat_traversal_(true),
       allow_relay_(true),
       allow_pairing_(true),
       curtain_required_(false),
@@ skipping 46 matching lines @@
 #elif defined(OS_POSIX)
   base::FileDescriptor pipe(pipe_handle, true);
   IPC::ChannelHandle channel_handle(channel_name, pipe);
 #endif  // defined(OS_POSIX)
 
   // Connect to the daemon process.
   daemon_channel_ = IPC::ChannelProxy::Create(channel_handle,
                                               IPC::Channel::MODE_CLIENT,
                                               this,
                                               context_->network_task_runner());
+  attachment_broker_->DesignateBrokerCommunicationChannel(

[Sergey Ulanov, 2015/12/12 06:41:33]

Comments for IPC::AttachmentBrokerUnprivileged::CreateBroker() say that it may
return nullptr, so you attachment_broker_ may be nullptr here

[erikchen, 2015/12/18 19:14:10]

good point. Added a conditional.

+      daemon_channel_.get());
+
 #else  // !defined(REMOTING_MULTI_PROCESS)
   // Connect to the daemon process.
   std::string channel_name =
       cmd_line->GetSwitchValueASCII(kDaemonPipeSwitchName);
   if (!channel_name.empty()) {
     daemon_channel_ =
         IPC::ChannelProxy::Create(channel_name, IPC::Channel::MODE_CLIENT, this,
                                   context_->network_task_runner().get());
+    attachment_broker_->DesignateBrokerCommunicationChannel(
+        daemon_channel_.get());
   }
 
   if (cmd_line->HasSwitch(kHostConfigSwitchName)) {
     host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName);
 
     // Read config from stdin if necessary.
     if (host_config_path_ == base::FilePath(kStdinConfigPath)) {
       const size_t kBufferSize = 4096;
       scoped_ptr<char[]> buf(new char[kBufferSize]);
       size_t len;
@@ skipping 1154 matching lines @@
       base::TimeDelta::FromSeconds(kShutdownTimeoutSeconds));
   new HostProcess(context.Pass(), &exit_code, &shutdown_watchdog);
 
   // Run the main (also UI) message loop until the host no longer needs it.
   message_loop.Run();
 
   return exit_code;
 }
 
 }  // namespace remoting