Get service processes working on Mac and Linux.

chrome/browser/service/service_process_control.cc

 // Copyright (c) 2010 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 "chrome/browser/service/service_process_control.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/process_util.h"
 #include "base/stl_util-inl.h"
@@ skipping 104 matching lines @@
   }
 
   // Actually going to connect.
   VLOG(1) << "Connecting to Service Process IPC Server";
   // Run the IPC channel on the shared IO thread.
   base::Thread* io_thread = g_browser_process->io_thread();
 
   // TODO(hclam): Handle error connecting to channel.
   const std::string channel_id = GetServiceProcessChannelName();
   channel_.reset(
-      new IPC::SyncChannel(channel_id, IPC::Channel::MODE_CLIENT, this,
+      new IPC::SyncChannel(channel_id, IPC::Channel::MODE_NAMED_CLIENT, this,
                            io_thread->message_loop(), true,
                            g_browser_process->shutdown_event()));
-  channel_->set_sync_messages_with_no_timeout_allowed(false);
-
-  // We just established a channel with the service process. Notify it if an
-  // upgrade is available.
-  if (UpgradeDetector::GetInstance()->notify_upgrade()) {
-    Send(new ServiceMsg_UpdateAvailable);
-  } else {
-    if (registrar_.IsEmpty())
-      registrar_.Add(this, NotificationType::UPGRADE_RECOMMENDED,
-                     NotificationService::AllSources());
-  }
 }
 
 void ServiceProcessControl::RunConnectDoneTasks() {
   RunAllTasksHelper(&connect_done_tasks_);
   DCHECK(connect_done_tasks_.empty());
   if (is_connected()) {
     RunAllTasksHelper(&connect_success_tasks_);
     DCHECK(connect_success_tasks_.empty());
     STLDeleteElements(&connect_failure_tasks_);
   } else {
@@ skipping 23 matching lines @@
       failure_task = NULL;
       connect_done_tasks_.push_back(success_task);
     } else {
       connect_success_tasks_.push_back(success_task);
     }
   }
 
   if (failure_task)
     connect_failure_tasks_.push_back(failure_task);
 
+  // If we already in the process of launching, then we are done.
+  if (launcher_) {
+    return;
+  }
+
   // If the service process is already running then connects to it.
   if (CheckServiceProcessReady()) {
     ConnectInternal();
     return;
   }
 
-  // If we already in the process of launching, then we are done.
-  if (launcher_) {
-    return;
-  }
-
   // A service process should have a different mechanism for starting, but now
   // we start it as if it is a child process.
   FilePath exe_path = ChildProcessHost::GetChildPath(true);
   if (exe_path.empty()) {
     NOTREACHED() << "Unable to get service process binary name.";
   }
 
   CommandLine* cmd_line = new CommandLine(exe_path);
   cmd_line->AppendSwitchASCII(switches::kProcessType,
                               switches::kServiceProcess);
@@ skipping 45 matching lines @@
                         OnCloudPrintProxyIsEnabled)
     IPC_MESSAGE_HANDLER(ServiceHostMsg_RemotingHost_HostInfo,
                          OnRemotingHostInfo)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ServiceProcessControl::OnChannelConnected(int32 peer_pid) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  channel_->set_sync_messages_with_no_timeout_allowed(false);
+
+  // We just established a channel with the service process. Notify it if an
+  // upgrade is available.
+  if (UpgradeDetector::GetInstance()->notify_upgrade()) {
+    Send(new ServiceMsg_UpdateAvailable);
+  } else {
+    if (registrar_.IsEmpty())
+      registrar_.Add(this, NotificationType::UPGRADE_RECOMMENDED,
+                     NotificationService::AllSources());
+  }
   RunConnectDoneTasks();
 }
 
 void ServiceProcessControl::OnChannelError() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   channel_.reset();
   RunConnectDoneTasks();
 }
 
 bool ServiceProcessControl::Send(IPC::Message* message) {
@@ skipping 66 matching lines @@
     MessageHandler* message_handler) {
   message_handlers_.insert(message_handler);
 }
 
 void ServiceProcessControl::RemoveMessageHandler(
     MessageHandler* message_handler) {
   message_handlers_.erase(message_handler);
 }
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControl);