Remove base::Callback from ContextProvider creation.

content/common/gpu/client/context_provider_command_buffer.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_CONTEXT_PROVIDER_COMMAND_BUFFER
 #define CONTENT_COMMON_GPU_CLIENT_CONTEXT_PROVIDER_COMMAND_BUFFER
 
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/context_provider.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 
 namespace webkit {
 namespace gpu {
 class GrContextForWebGraphicsContext3D;
 }
 }
 
 namespace content {
 
 // Implementation of cc::ContextProvider that provides a
 // WebGraphicsContext3DCommandBufferImpl context and a GrContext.
 class ContextProviderCommandBuffer : public cc::ContextProvider {
  public:
-  typedef base::Callback<
-      scoped_ptr<WebGraphicsContext3DCommandBufferImpl>(void)> CreateCallback;
   static scoped_refptr<ContextProviderCommandBuffer> Create(
-      const CreateCallback& create_callback);
+      scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d);
 
   virtual bool BindToCurrentThread() OVERRIDE;
   virtual WebGraphicsContext3DCommandBufferImpl* Context3d() OVERRIDE;
   virtual class GrContext* GrContext() OVERRIDE;
   virtual void VerifyContexts() OVERRIDE;
   virtual bool DestroyedOnMainThread() OVERRIDE;
   virtual void SetLostContextCallback(
       const LostContextCallback& lost_context_callback) OVERRIDE;
   virtual void SetSwapBuffersCompleteCallback(
       const SwapBuffersCompleteCallback& swap_buffers_complete_callback)
       OVERRIDE;
   virtual void SetMemoryPolicyChangedCallback(
       const MemoryPolicyChangedCallback& memory_policy_changed_callback)
       OVERRIDE;
 
   void set_leak_on_destroy() {
     base::AutoLock lock(main_thread_lock_);
     leak_on_destroy_ = true;
   }
 
  protected:
-  ContextProviderCommandBuffer();
+  ContextProviderCommandBuffer(
+      scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d);
   virtual ~ContextProviderCommandBuffer();
 
-  // This must be called immedately after creating this object, and it should
-  // be thrown away if this returns false.
-  bool InitializeOnMainThread(const CreateCallback& create_callback);
-
   void OnLostContext();
   void OnSwapBuffersComplete();
   void OnMemoryAllocationChanged(
       const WebKit::WebGraphicsMemoryAllocation& allocation);
 
  private:
   base::ThreadChecker main_thread_checker_;
   base::ThreadChecker context_thread_checker_;
 
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d_;
@@ skipping 14 matching lines @@
   scoped_ptr<SwapBuffersCompleteCallbackProxy>
       swap_buffers_complete_callback_proxy_;
 
   class MemoryAllocationCallbackProxy;
   scoped_ptr<MemoryAllocationCallbackProxy> memory_allocation_callback_proxy_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_CONTEXT_PROVIDER_COMMAND_BUFFER