Remove uses of ChannelHandle for service processes.

chrome/service/service_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.
 
 #include "chrome/service/service_process.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/base_switches.h"
@@ skipping 104 matching lines @@
       l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
   base::i18n::AdjustStringForLocaleDirection(&adjusted_string);
   dlg_strings.append(adjusted_string);
   dlg_strings.push_back('|');
   dlg_strings.append(base::ASCIIToUTF16(
       base::i18n::IsRTL() ? env_vars::kRtlLocale : env_vars::kLtrLocale));
 
   env->SetVar(env_vars::kRestartInfo, base::UTF16ToUTF8(dlg_strings));
 }
 
-#if defined(OS_POSIX)
-mojo::edk::ScopedPlatformHandle CreateServerHandle(
-    const IPC::ChannelHandle& channel_handle) {
-#if defined(OS_MACOSX)
-  mojo::edk::PlatformHandle platform_handle(channel_handle.socket.fd);
-  platform_handle.needs_connection = true;
-  return mojo::edk::ScopedPlatformHandle(platform_handle);
-#else
-  return mojo::edk::CreateServerHandle(
-      mojo::edk::NamedPlatformHandle(channel_handle.name));
-#endif
-}
-#endif
-
 }  // namespace
 
 ServiceProcess::ServiceProcess()
     : shutdown_event_(base::WaitableEvent::ResetPolicy::MANUAL,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
       main_message_loop_(NULL),
       enabled_services_(0),
       update_available_(false) {
   DCHECK(!g_service_process);
   g_service_process = this;
@@ skipping 164 matching lines @@
   // new connections.
   if (!enabled_services_ || update_available_) {
     Shutdown();
     return false;
   }
   return true;
 }
 
 mojo::ScopedMessagePipeHandle ServiceProcess::CreateChannelMessagePipe() {
   if (!server_handle_.is_valid()) {
-#if defined(OS_POSIX)
-    server_handle_ =
-        CreateServerHandle(service_process_state_->GetServiceProcessChannel());
+#if defined(OS_MACOSX)
+    mojo::edk::PlatformHandle platform_handle(
+        service_process_state_->GetServiceProcessChannel().release());
+    platform_handle.needs_connection = true;
+    server_handle_.reset(platform_handle);
+#elif defined(OS_POSIX)
+    server_handle_ = mojo::edk::CreateServerHandle(
+        service_process_state_->GetServiceProcessChannel());
 #elif defined(OS_WIN)
-    server_handle_ = mojo::edk::NamedPlatformHandle(
-        service_process_state_->GetServiceProcessChannel().name);
+    server_handle_ = service_process_state_->GetServiceProcessChannel();
 #endif
     DCHECK(server_handle_.is_valid());
   }
 
   mojo::edk::ScopedPlatformHandle channel_handle;
 #if defined(OS_POSIX)
   channel_handle = mojo::edk::DuplicatePlatformHandle(server_handle_.get());
 #elif defined(OS_WIN)
   mojo::edk::CreateServerHandleOptions options;
   options.enforce_uniqueness = false;
@@ skipping 79 matching lines @@
     } else {
       Shutdown();
     }
   }
 }
 
 ServiceProcess::~ServiceProcess() {
   Teardown();
   g_service_process = NULL;
 }