Remove base::Callback from ContextProvider creation.

content/browser/renderer_host/compositor_impl_android.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/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <map>
 
@@ skipping 347 matching lines @@
   DCHECK(bitmap.size() == sub_rect.size());
   if (bitmap.size() != sub_rect.size() || texture_id == 0) return false;
 
   GLHelper* helper = ImageTransportFactoryAndroid::GetInstance()->GetGLHelper();
   helper->ReadbackTextureSync(texture_id,
                               sub_rect,
                               static_cast<unsigned char*> (bitmap.pixels()));
   return true;
 }
 
-static scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl>
-CreateInProcessViewContext(
-    const WebKit::WebGraphicsContext3D::Attributes attributes,
-    ANativeWindow* window) {
-  using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
-  return WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
-      attributes, window).Pass();
-}
-
 static scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
 CreateGpuProcessViewContext(
     const WebKit::WebGraphicsContext3D::Attributes attributes,
     int surface_id,
     base::WeakPtr<CompositorImpl> compositor_impl) {
   GpuChannelHostFactory* factory = BrowserGpuChannelHostFactory::instance();
   GURL url("chrome://gpu/Compositor::createContext3D");
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context(
       new WebGraphicsContext3DCommandBufferImpl(surface_id,
                                                 url,
@@ skipping 21 matching lines @@
   return context.Pass();
 }
 
 scoped_ptr<cc::OutputSurface> CompositorImpl::CreateOutputSurface(
     bool fallback) {
   WebKit::WebGraphicsContext3D::Attributes attrs;
   attrs.shareResources = true;
   attrs.noAutomaticFlushes = true;
 
   if (g_use_direct_gl) {
+    using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
+    scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d =
+        WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext(
+            attrs, window_);
     scoped_refptr<webkit::gpu::ContextProviderInProcess> context_provider =
-        webkit::gpu::ContextProviderInProcess::Create(
-            base::Bind(&CreateInProcessViewContext, attrs, window_));
+        webkit::gpu::ContextProviderInProcess::Create(context3d.Pass());
 
     scoped_ptr<cc::OutputSurface> output_surface;
     if (!window_)
       output_surface.reset(new DirectOutputSurface(context_provider));
     else
       output_surface.reset(new cc::OutputSurface(context_provider));
     return output_surface.Pass();
   }
 
   DCHECK(window_);
   DCHECK(surface_id_);
 
   scoped_refptr<ContextProviderCommandBuffer> context_provider =
-      ContextProviderCommandBuffer::Create(
-          base::Bind(&CreateGpuProcessViewContext,
-                     attrs,
-                     surface_id_,
-                     weak_factory_.GetWeakPtr()));
+      ContextProviderCommandBuffer::Create(CreateGpuProcessViewContext(
+          attrs, surface_id_, weak_factory_.GetWeakPtr()));
   if (!context_provider.get()) {
     LOG(ERROR) << "Failed to create 3D context for compositor.";
     return scoped_ptr<cc::OutputSurface>();
   }
   return scoped_ptr<cc::OutputSurface>(
       new OutputSurfaceWithoutParent(context_provider));
 }
 
 void CompositorImpl::OnLostResources() {
   client_->DidLoseResources();
@@ skipping 84 matching lines @@
     case ANDROID_BITMAP_FORMAT_RGBA_8888:
       return GL_UNSIGNED_BYTE;
       break;
     case ANDROID_BITMAP_FORMAT_RGB_565:
     default:
       return GL_UNSIGNED_SHORT_5_6_5;
   }
 }
 
 } // namespace content