Clean up SyncCompositorFactory context creation

content/browser/android/in_process/synchronous_compositor_impl.cc

 // Copyright 2013 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/android/in_process/synchronous_compositor_impl.h"
 
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/input/input_handler.h"
 #include "content/browser/android/in_process/synchronous_compositor_factory_impl.h"
@@ skipping 76 matching lines @@
     scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
   g_factory.Get().SetDeferredGpuService(service);
 }
 
 bool SynchronousCompositorImpl::InitializeHwDraw(
     scoped_refptr<gfx::GLSurface> surface) {
   DCHECK(CalledOnValidThread());
   DCHECK(output_surface_);
 
   // Create contexts in this order so that the share group gets passed
   // along correctly.

[no sievers, 2014/05/08 18:57:14]

If you are removing this, then the comment does not apply anymore and you should
remove it too.

-  scoped_refptr<cc::ContextProvider> offscreen_context =
-      g_factory.Get().GetOffscreenContextProviderForCompositorThread();
   scoped_refptr<cc::ContextProvider> onscreen_context =
-  g_factory.Get().CreateOnscreenContextProviderForCompositorThread(surface);
+      g_factory.Get().CreateOnscreenContextProviderForCompositorThread(
+          surface.get());
 
   bool success = output_surface_->InitializeHwDraw(onscreen_context);
 
   if (success)
     g_factory.Get().CompositorInitializedHardwareDraw();
   return success;
 }
 
 void SynchronousCompositorImpl::ReleaseHwDraw() {
   DCHECK(CalledOnValidThread());
@@ skipping 172 matching lines @@
     g_factory.Get();  // Ensure it's initialized.
     SynchronousCompositorImpl::CreateForWebContents(contents);
   }
   if (SynchronousCompositorImpl* instance =
       SynchronousCompositorImpl::FromWebContents(contents)) {
     instance->SetClient(client);
   }
 }
 
 }  // namespace content