Make channel preemption not require view contexts for hookup

content/browser/renderer_host/render_widget_host_impl.cc

Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 0670683432c0d8ad50ab48e78c838654a48f9184..2b95d12755c48067f14f247a9da62550000213ff 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -309,9 +309,6 @@ void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) {
                                            view_->GetSurfaceIdNamespace()));
   }
 
-  GpuSurfaceTracker::Get()->SetSurfaceHandle(
-      surface_id_, GetCompositingSurface());
-
   synthetic_gesture_controller_.reset();
 }
 
@@ -337,12 +334,6 @@ gfx::NativeViewId RenderWidgetHostImpl::GetNativeViewId() const {
   return 0;
 }
 
-gfx::GLSurfaceHandle RenderWidgetHostImpl::GetCompositingSurface() {
-  if (view_)
-    return view_->GetCompositingSurface();
-  return gfx::GLSurfaceHandle();
-}
-
 void RenderWidgetHostImpl::ResetSizeAndRepaintPendingFlags() {
   resize_ack_pending_ = false;
   if (repaint_ack_pending_) {
@@ -396,9 +387,6 @@ void RenderWidgetHostImpl::Init() {
 
   renderer_initialized_ = true;
 
-  GpuSurfaceTracker::Get()->SetSurfaceHandle(
-      surface_id_, GetCompositingSurface());
-
   // Send the ack along with the information on placement.
   Send(new ViewMsg_CreatingNew_ACK(routing_id_));
   GetProcess()->ResumeRequestsForView(routing_id_);
@@ -1273,8 +1261,6 @@ void RenderWidgetHostImpl::RendererExited(base::TerminationStatus status,
   StopHangMonitorTimeout();
 
   if (view_) {
-    GpuSurfaceTracker::Get()->SetSurfaceHandle(surface_id_,
-                                               gfx::GLSurfaceHandle());
     view_->RenderProcessGone(status, exit_code);
     view_ = nullptr;  // The View should be deleted by RenderProcessGone.
     view_weak_.reset();