Use GpuBrowserCompositorOutputSurface with Surfaces.

content/browser/compositor/onscreen_display_client.cc

Index: content/browser/compositor/onscreen_display_client.cc
diff --git a/content/browser/compositor/onscreen_display_client.cc b/content/browser/compositor/onscreen_display_client.cc
index 7c349b056c22ff76d3f8f3715e3309c26e1117fa..da60316490f034c0e8f530e1a0b713dcca816173 100644
--- a/content/browser/compositor/onscreen_display_client.cc
+++ b/content/browser/compositor/onscreen_display_client.cc
@@ -13,12 +13,10 @@
 namespace content {
 
 OnscreenDisplayClient::OnscreenDisplayClient(
-    const scoped_refptr<cc::ContextProvider>& onscreen_context_provider,
-    scoped_ptr<cc::OutputSurface> software_surface,
+    scoped_ptr<cc::OutputSurface> output_surface,
     cc::SurfaceManager* manager,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
-    : onscreen_context_provider_(onscreen_context_provider),
-      software_surface_(software_surface.Pass()),
+    : output_surface_(output_surface.Pass()),
       display_(
           new cc::Display(this, manager, HostSharedBitmapManager::current())),
       task_runner_(task_runner),
@@ -30,10 +28,8 @@ OnscreenDisplayClient::~OnscreenDisplayClient() {
 }
 
 scoped_ptr<cc::OutputSurface> OnscreenDisplayClient::CreateOutputSurface() {
-  if (!onscreen_context_provider_.get())
-    return software_surface_.Pass();
-  return make_scoped_ptr(new cc::OutputSurface(onscreen_context_provider_))
-      .Pass();
+  DCHECK(output_surface_.get());
+  return output_surface_.Pass();
 }
 
 void OnscreenDisplayClient::DisplayDamaged() {