Refactor: Remove BrokerGetFileHandleForProcess.

The method is no longer necessary, since callers can directly call
IPC::GetPlatformFileForTransit.

BUG=493414

Review URL: https://codereview.chromium.org/1869093002

Cr-Commit-Position: refs/heads/master@{#387012}

content/browser/renderer_host/pepper/pepper_file_io_host.cc

@@ -15,13 +15,13 @@
 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h"
 #include "content/browser/renderer_host/pepper/pepper_security_helper.h"
 #include "content/common/fileapi/file_system_messages.h"
-#include "content/common/sandbox_util.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
+#include "ipc/ipc_platform_file.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/host/dispatch_host_message.h"
@@ -480,14 +480,8 @@ void PepperFileIOHost::SendOpenErrorReply(
 bool PepperFileIOHost::AddFileToReplyContext(
     int32_t open_flags,
     ppapi::host::ReplyMessageContext* reply_context) const {
-  base::ProcessId plugin_process_id =
-      base::GetProcId(browser_ppapi_host_->GetPluginProcess().Handle());
-  if (plugin_process_id == base::kNullProcessId)
-    plugin_process_id = resolved_render_process_id_;
-
   IPC::PlatformFileForTransit transit_file =
-      BrokerGetFileHandleForProcess(file_.GetPlatformFile(), plugin_process_id,
-                                    false);
+      IPC::GetPlatformFileForTransit(file_.GetPlatformFile(), false);
   if (transit_file == IPC::InvalidPlatformFileForTransit())
     return false;
 

content/common/BUILD.gn

@@ -315,7 +315,6 @@ source_set("common") {
       "pepper_renderer_instance_data.h",
       "plugin_list.cc",
       "plugin_list.h",
-      "sandbox_util.cc",
     ]
   }
 

content/content_common.gypi

@@ -539,8 +539,6 @@
       'common/sandbox_linux/sandbox_seccomp_bpf_linux.h',
       'common/sandbox_mac.h',
       'common/sandbox_mac.mm',
-      'common/sandbox_util.cc',
-      'common/sandbox_util.h',
       'common/sandbox_win.cc',
       'common/sandbox_win.h',
       'common/savable_subframe.h',
@@ -707,7 +705,6 @@
         'common/pepper_renderer_instance_data.h',
         'common/plugin_list.cc',
         'common/plugin_list.h',
-        'common/sandbox_util.cc',
         'public/common/pepper_plugin_info.cc',
         'public/common/pepper_plugin_info.h',
       ],

content/ppapi_plugin/ppapi_thread.cc

@@ -28,7 +28,6 @@
 #include "content/child/child_discardable_shared_memory_manager.h"
 #include "content/child/child_process.h"
 #include "content/common/child_process_messages.h"
-#include "content/common/sandbox_util.h"
 #include "content/ppapi_plugin/broker_process_dispatcher.h"
 #include "content/ppapi_plugin/plugin_process_dispatcher.h"
 #include "content/ppapi_plugin/ppapi_blink_platform_impl.h"
@@ -192,15 +191,7 @@ IPC::PlatformFileForTransit PpapiThread::ShareHandleWithRemote(
     base::PlatformFile handle,
     base::ProcessId peer_pid,
     bool should_close_source) {
-#if defined(OS_WIN)
-  if (peer_handle_.IsValid()) {
-    DCHECK(is_broker_);
-    return IPC::GetPlatformFileForTransit(handle, should_close_source);
-  }
-#endif
-
-  DCHECK(peer_pid != base::kNullProcessId);
-  return BrokerGetFileHandleForProcess(handle, peer_pid, should_close_source);
+  return IPC::GetPlatformFileForTransit(handle, should_close_source);
 }
 
 base::SharedMemoryHandle PpapiThread::ShareSharedMemoryHandleWithRemote(

content/renderer/pepper/host_array_buffer_var.cc

@@ -13,7 +13,6 @@
 #include "base/memory/shared_memory.h"
 #include "base/process/process_handle.h"
 #include "content/common/pepper_file_util.h"
-#include "content/common/sandbox_util.h"
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/plugin_module.h"
 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"

content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc

@@ -6,11 +6,7 @@
 
 #include "build/build_config.h"
 #include "content/child/child_process.h"
-#include "content/common/sandbox_util.h"
-
-#if defined(OS_WIN) || defined(OS_MACOSX)
-#include "content/public/common/sandbox_init.h"
-#endif  // defined(OS_WIN) || defined(OS_MACOSX)
+#include "ipc/ipc_platform_file.h"
 
 namespace content {
 
@@ -33,7 +29,7 @@ PepperProxyChannelDelegateImpl::ShareHandleWithRemote(
     base::PlatformFile handle,
     base::ProcessId remote_pid,
     bool should_close_source) {
-  return BrokerGetFileHandleForProcess(handle, remote_pid, should_close_source);
+  return IPC::GetPlatformFileForTransit(handle, should_close_source);
 }
 
 base::SharedMemoryHandle

content/renderer/pepper/renderer_ppapi_host_impl.cc

@@ -11,7 +11,6 @@
 #include "base/process/process_handle.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "content/common/sandbox_util.h"
 #include "content/renderer/pepper/fullscreen_container.h"
 #include "content/renderer/pepper/host_globals.h"
 #include "content/renderer/pepper/pepper_browser_connection.h"
@@ -23,6 +22,7 @@
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "ipc/ipc_message.h"
+#include "ipc/ipc_platform_file.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
@@ -225,8 +225,7 @@ IPC::PlatformFileForTransit RendererPpapiHostImpl::ShareHandleWithRemote(
     // Duplicate the file handle for in process mode so this function
     // has the same semantics for both in process mode and out of
     // process mode (i.e., the remote side must cloes the handle).
-    return BrokerGetFileHandleForProcess(
-        handle, base::GetCurrentProcId(), should_close_source);
+    return IPC::GetPlatformFileForTransit(handle, should_close_source);
   }
   return dispatcher_->ShareHandleWithRemote(handle, should_close_source);
 }