Remove base::Callback from ContextProvider creation.

content/common/gpu/client/context_provider_command_buffer.cc

 // 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.
 
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 
 #include "base/callback_helpers.h"
 #include "cc/output/managed_memory_policy.h"
 #include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h"
 #include "webkit/common/gpu/managed_memory_policy_convert.h"
@@ skipping 58 matching lines @@
   virtual void onMemoryAllocationChanged(
       WebKit::WebGraphicsMemoryAllocation allocation) {
     provider_->OnMemoryAllocationChanged(allocation);
   }
 
  private:
   ContextProviderCommandBuffer* provider_;
 };
 
 scoped_refptr<ContextProviderCommandBuffer>
-ContextProviderCommandBuffer::Create(const CreateCallback& create_callback) {
-  scoped_refptr<ContextProviderCommandBuffer> provider =
-      new ContextProviderCommandBuffer;
-  if (!provider->InitializeOnMainThread(create_callback))
+ContextProviderCommandBuffer::Create(
+    scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d) {
+  if (!context3d)
     return NULL;
-  return provider;
+
+  return new ContextProviderCommandBuffer(context3d.Pass());
 }
 
-ContextProviderCommandBuffer::ContextProviderCommandBuffer()
-    : leak_on_destroy_(false),
+ContextProviderCommandBuffer::ContextProviderCommandBuffer(
+    scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d)
+    : context3d_(context3d.Pass()),
+      leak_on_destroy_(false),
       destroyed_(false) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
+  DCHECK(context3d_);
   context_thread_checker_.DetachFromThread();
 }
 
 ContextProviderCommandBuffer::~ContextProviderCommandBuffer() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
 
   base::AutoLock lock(main_thread_lock_);
   if (leak_on_destroy_) {
     WebGraphicsContext3DCommandBufferImpl* context3d ALLOW_UNUSED =
         context3d_.release();
     webkit::gpu::GrContextForWebGraphicsContext3D* gr_context ALLOW_UNUSED =
         gr_context_.release();
   }
 }
 
-bool ContextProviderCommandBuffer::InitializeOnMainThread(
-    const CreateCallback& create_callback) {
-  DCHECK(main_thread_checker_.CalledOnValidThread());
-
-  DCHECK(!context3d_);
-  DCHECK(!create_callback.is_null());
-  context3d_ = create_callback.Run();
-  return !!context3d_;
-}
-
 bool ContextProviderCommandBuffer::BindToCurrentThread() {
   DCHECK(context3d_);
 
   // This is called on the thread the context will be used.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (lost_context_callback_proxy_)
     return true;
 
   if (!context3d_->makeContextCurrent())
@@ skipping 103 matching lines @@
 
 void ContextProviderCommandBuffer::SetMemoryPolicyChangedCallback(
     const MemoryPolicyChangedCallback& memory_policy_changed_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(memory_policy_changed_callback_.is_null() ||
          memory_policy_changed_callback.is_null());
   memory_policy_changed_callback_ = memory_policy_changed_callback;
 }
 
 }  // namespace content