Remove obsolete methods from IPC::Channel and related classes.

content/browser/utility_process_host_impl.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 "content/browser/utility_process_host_impl.h"
 
 #include <utility>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 49 matching lines @@
 }  // namespace
 #endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 
 // NOTE: changes to this class need to be reviewed by the security team.
 class UtilitySandboxedProcessLauncherDelegate
     : public SandboxedProcessLauncherDelegate {
  public:
   UtilitySandboxedProcessLauncherDelegate(const base::FilePath& exposed_dir,
                                           bool launch_elevated,
                                           bool no_sandbox,
-                                          const base::EnvironmentMap& env,
-                                          ChildProcessHost* host)
+                                          const base::EnvironmentMap& env)
       : exposed_dir_(exposed_dir),
 #if defined(OS_WIN)
         launch_elevated_(launch_elevated)
 #elif defined(OS_POSIX)
-        env_(env),
+        env_(env)
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-        no_sandbox_(no_sandbox),
+        ,
+        no_sandbox_(no_sandbox)
 #endif  // !defined(OS_MACOSX)  && !defined(OS_ANDROID)
-        ipc_fd_(host->TakeClientFileDescriptor())
 #endif  // OS_WIN
   {}
 
   ~UtilitySandboxedProcessLauncherDelegate() override {}
 
 #if defined(OS_WIN)
   bool ShouldLaunchElevated() override { return launch_elevated_; }
 
   bool PreSpawnTarget(sandbox::TargetPolicy* policy) override {
     if (exposed_dir_.empty())
@@ skipping 16 matching lines @@
 #elif defined(OS_POSIX)
 
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
   ZygoteHandle* GetZygote() override {
     if (no_sandbox_ || !exposed_dir_.empty())
       return nullptr;
     return GetGenericZygote();
   }
 #endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
   base::EnvironmentMap GetEnvironment() override { return env_; }
-  base::ScopedFD TakeIpcFd() override { return std::move(ipc_fd_); }
 #endif  // OS_WIN
 
   SandboxType GetSandboxType() override {
     return SANDBOX_TYPE_UTILITY;
   }
 
  private:
   base::FilePath exposed_dir_;
 
 #if defined(OS_WIN)
   bool launch_elevated_;
 #elif defined(OS_POSIX)
   base::EnvironmentMap env_;
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
   bool no_sandbox_;
 #endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
-  base::ScopedFD ipc_fd_;
 #endif  // OS_WIN
 };
 
 UtilityMainThreadFactoryFunction g_utility_main_thread_factory = NULL;
 
 UtilityProcessHost* UtilityProcessHost::Create(
     const scoped_refptr<UtilityProcessHostClient>& client,
     const scoped_refptr<base::SequencedTaskRunner>& client_task_runner) {
   return new UtilityProcessHostImpl(client, client_task_runner);
 }
@@ skipping 190 matching lines @@
                                  exposed_dir_);
     }
 
 #if defined(OS_WIN)
     // Let the utility process know if it is intended to be elevated.
     if (run_elevated_)
       cmd_line->AppendSwitch(switches::kUtilityProcessRunningElevated);
 #endif
 
     process_->Launch(new UtilitySandboxedProcessLauncherDelegate(
-                         exposed_dir_, run_elevated_, no_sandbox_, env_,
-                         process_->GetHost()),
+                         exposed_dir_, run_elevated_, no_sandbox_, env_),
                      cmd_line, true);
   }
 
   return true;
 }
 
 bool UtilityProcessHostImpl::OnMessageReceived(const IPC::Message& message) {
   if (!client_.get())
     return true;
 
@@ skipping 41 matching lines @@
     base::WeakPtr<UtilityProcessHostImpl> host,
     int error_code) {
   if (!host)
     return;
 
   host->OnProcessLaunchFailed(error_code);
   delete host.get();
 }
 
 }  // namespace content