EDK: Make PlatformChannelPair not depend/use on base::CommandLine.

mojo/edk/embedder/platform_channel_pair.cc

 // Copyright 2014 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 "mojo/edk/embedder/platform_channel_pair.h"
 
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/posix/global_descriptors.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "mojo/edk/embedder/platform_handle.h"
 
 namespace mojo {
 namespace embedder {
 
 namespace {
@@ skipping 44 matching lines @@
 ScopedPlatformHandle PlatformChannelPair::PassServerHandle() {
   return server_handle_.Pass();
 }
 
 ScopedPlatformHandle PlatformChannelPair::PassClientHandle() {
   return client_handle_.Pass();
 }
 
 // static
 ScopedPlatformHandle PlatformChannelPair::PassClientHandleFromParentProcess(
-    const base::CommandLine& command_line) {
-  std::string client_fd_string =
-      command_line.GetSwitchValueASCII(kMojoPlatformChannelHandleSwitch);
+    const std::string& string_from_parent) {
   int client_fd = -1;
-  if (client_fd_string.empty() ||
-      !base::StringToInt(client_fd_string, &client_fd) ||
-      client_fd < base::GlobalDescriptors::kBaseDescriptor) {
+  if (!base::StringToInt(string_from_parent, &client_fd)) {
     LOG(ERROR) << "Missing or invalid --" << kMojoPlatformChannelHandleSwitch;
     return ScopedPlatformHandle();
   }
 
   return ScopedPlatformHandle(PlatformHandle(client_fd));
 }
 
 void PlatformChannelPair::PrepareToPassClientHandleToChildProcess(
-    base::CommandLine* command_line,
-    base::FileHandleMappingVector* handle_passing_info) const {
-  DCHECK(command_line);
+    std::string* string_for_child,
+    HandlePassingInformation* handle_passing_info) const {
+  DCHECK(string_for_child);
   DCHECK(handle_passing_info);
   // This is an arbitrary sanity check. (Note that this guarantees that the loop
   // below will terminate sanely.)
   CHECK_LT(handle_passing_info->size(), 1000u);
 
   DCHECK(client_handle_.is_valid());
 
   // Find a suitable FD to map our client handle to in the child process.
   // This has quadratic time complexity in the size of |*handle_passing_info|,
   // but |*handle_passing_info| should be very small (usually/often empty).
   int target_fd = base::GlobalDescriptors::kBaseDescriptor;
   while (IsTargetDescriptorUsed(*handle_passing_info, target_fd))
     target_fd++;
 
   handle_passing_info->push_back(
       std::pair<int, int>(client_handle_.get().fd, target_fd));
-  // Log a warning if the command line already has the switch, but "clobber" it
-  // anyway, since it's reasonably likely that all the switches were just copied
-  // from the parent.
-  LOG_IF(WARNING, command_line->HasSwitch(kMojoPlatformChannelHandleSwitch))
-      << "Child command line already has switch --"
-      << kMojoPlatformChannelHandleSwitch << "="
-      << command_line->GetSwitchValueASCII(kMojoPlatformChannelHandleSwitch);
-  // (Any existing switch won't actually be removed from the command line, but
-  // the last one appended takes precedence.)
-  command_line->AppendSwitchASCII(kMojoPlatformChannelHandleSwitch,
-                                  base::IntToString(target_fd));
+  *string_for_child = base::IntToString(target_fd);
 }
 
 void PlatformChannelPair::ChildProcessLaunched() {
   DCHECK(client_handle_.is_valid());
   client_handle_.reset();
 }
 
 }  // namespace embedder
 }  // namespace mojo