Make channel preemption not require view contexts for hookup

content/common/gpu/gpu_command_buffer_stub.h

Index: content/common/gpu/gpu_command_buffer_stub.h
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index b1aac89a3904a15587a5a06f6de75dfd74e24434..50cd5083d569ebb8267a69f8ec5708ed7ba7a0fc 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -83,9 +83,8 @@ class GpuCommandBufferStub
       bool use_virtualized_gl_context,
       int32 stream_id,
       int32 route_id,
-      int32 surface_id,
+      bool offscreen,
       GpuWatchdog* watchdog,
-      bool software,
       const GURL& active_url);
 
   ~GpuCommandBufferStub() override;
@@ -116,9 +115,6 @@ class GpuCommandBufferStub
   // Unique command buffer ID for this command buffer stub.
   uint64_t command_buffer_id() const { return command_buffer_id_; }
 
-  // Identifies the target surface.
-  int32 surface_id() const { return surface_id_; }
-
   // Identifies the various GpuCommandBufferStubs in the GPU process belonging
   // to the same renderer process.
   int32 route_id() const { return route_id_; }
@@ -265,8 +261,7 @@ class GpuCommandBufferStub
   const uint64_t command_buffer_id_;
   const int32 stream_id_;
   const int32 route_id_;
-  const int32 surface_id_;
-  bool software_;
+  const bool offscreen_;
   uint32 last_flush_count_;
 
   scoped_ptr<gpu::CommandBufferService> command_buffer_;