Refactor configuration of sandboxes - first steps

content/browser/gpu/gpu_process_host.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/gpu/gpu_process_host.h"
 
 #include "base/base64.h"
 #include "base/base_switches.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 15 matching lines @@
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_widget_host_view_frame_subscriber.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/render_widget_host_view.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
+#include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_switches.h"
 #include "ui/events/latency_info.h"
 #include "ui/gl/gl_switches.h"
 
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "content/common/sandbox_win.h"
-#include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "sandbox/win/src/sandbox_policy.h"
 #include "ui/gfx/switches.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(USE_OZONE)
 #include "ui/ozone/ozone_switches.h"
@@ skipping 114 matching lines @@
   AcceleratedSurfaceBuffersSwappedCompletedForGPU(
       host_id, route_id, alive, timebase, interval);
   AcceleratedSurfaceBuffersSwappedCompletedForRenderer(
       surface_id, timebase, interval, latency_info);
 }
 
 // NOTE: changes to this class need to be reviewed by the security team.
 class GpuSandboxedProcessLauncherDelegate
     : public SandboxedProcessLauncherDelegate {
  public:
-  explicit GpuSandboxedProcessLauncherDelegate(CommandLine* cmd_line)
-      : cmd_line_(cmd_line) {}
+  GpuSandboxedProcessLauncherDelegate(CommandLine* cmd_line,
+                                      ChildProcessHost* /*host*/):

[jam, 2014/02/26 19:47:52]

nit: here and in other places, within content code doesn't comment out names for
unused parameters. i think consistency would be good

[aberent, 2014/02/28 08:51:06]

Done.

+                                        cmd_line_(cmd_line) {}

[jam, 2014/02/26 19:47:52]

nit: indentation

[aberent, 2014/02/28 08:51:06]

Done.

   virtual ~GpuSandboxedProcessLauncherDelegate() {}
 
   virtual void ShouldSandbox(bool* in_sandbox) OVERRIDE {
     if (cmd_line_->HasSwitch(switches::kDisableGpuSandbox)) {
       *in_sandbox = false;
       DVLOG(1) << "GPU sandbox is disabled";
     }
   }
 
   virtual void PreSandbox(bool* disable_default_policy,
@@ skipping 77 matching lines @@
           *success = false;
           return;
         }
       }
     }
   }
 
  private:
   CommandLine* cmd_line_;
 };
-#endif  // defined(OS_WIN)
+
+#elif defined(OS_POSIX)
+// NOTE: changes to this class need to be reviewed by the security team.
+class GpuSandboxedProcessLauncherDelegate

[jam, 2014/02/26 19:47:52]

ditto, we should have one implementation of this file per cc file

[aberent, 2014/02/28 08:51:06]

Done.

+    : public SandboxedProcessLauncherDelegate {
+ public:
+  GpuSandboxedProcessLauncherDelegate(CommandLine* /*cmd_line*/,
+                                      ChildProcessHost* host)
+      : ipc_fd_(host->TakeClientFileDescriptor()) {}
+  virtual ~GpuSandboxedProcessLauncherDelegate() {}
+
+  virtual int IpcFd() OVERRIDE {
+    return ipc_fd_;
+  }
+
+ private:
+  int ipc_fd_;
+};
+#endif  // OS_WIN
 
 }  // anonymous namespace
 
 // static
 bool GpuProcessHost::ValidateHost(GpuProcessHost* host) {
   if (!host)
     return false;
 
   // The Gpu process is invalid if it's not using SwiftShader, the card is
   // blacklisted, and we can kill it and start over.
@@ skipping 843 matching lines @@
   }
 
   UMA_HISTOGRAM_BOOLEAN("GPU.GPU.GPUProcessSoftwareRendering",
                         swiftshader_rendering_);
 
   // If specified, prepend a launcher program to the command line.
   if (!gpu_launcher.empty())
     cmd_line->PrependWrapper(gpu_launcher);
 
   process_->Launch(
-#if defined(OS_WIN)
-      new GpuSandboxedProcessLauncherDelegate(cmd_line),
-      false,
-#elif defined(OS_POSIX)
-      false,
-      base::EnvironmentMap(),
-#endif
+      new GpuSandboxedProcessLauncherDelegate(cmd_line,
+                                              process_->GetHost()),
       cmd_line);
   process_launched_ = true;
 
   UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLifetimeEvents",
                             LAUNCHED, GPU_PROCESS_LIFETIME_EVENT_MAX);
   return true;
 }
 
 void GpuProcessHost::SendOutstandingReplies() {
   valid_ = false;
@@ skipping 66 matching lines @@
   TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
   ClientIdToShaderCacheMap::iterator iter =
       client_id_to_shader_cache_.find(client_id);
   // If the cache doesn't exist then this is an off the record profile.
   if (iter == client_id_to_shader_cache_.end())
     return;
   iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
 }
 
 }  // namespace content