gpu: Introduce GpuChannelEstablishFactory.

content/browser/gpu/browser_gpu_channel_host_factory.cc

Index: content/browser/gpu/browser_gpu_channel_host_factory.cc
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc
index e71f1a96875d523f0adcc75cd5c453a63673908c..202db1e4a70755975d544dc4edf356d089093ad1 100644
--- a/content/browser/gpu/browser_gpu_channel_host_factory.cc
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
@@ -217,7 +217,7 @@ void BrowserGpuChannelHostFactory::Initialize(bool establish_gpu_channel) {
   instance_ = new BrowserGpuChannelHostFactory();
   if (establish_gpu_channel) {
     instance_->EstablishGpuChannel(CAUSE_FOR_GPU_LAUNCH_BROWSER_STARTUP,
-                                   base::Closure());
+                                   gpu::GpuChannelEstablishedCallback());
   }
 }
 
@@ -257,7 +257,7 @@ BrowserGpuChannelHostFactory::~BrowserGpuChannelHostFactory() {
   if (pending_request_.get())
     pending_request_->Cancel();
   for (size_t n = 0; n < established_callbacks_.size(); n++)
-    established_callbacks_[n].Run();
+    established_callbacks_[n].Run(nullptr);
   shutdown_event_->Signal();
   if (gpu_channel_) {
     gpu_channel_->DestroyChannel();
@@ -289,7 +289,8 @@ BrowserGpuChannelHostFactory::AllocateSharedMemory(size_t size) {
 scoped_refptr<gpu::GpuChannelHost>
 BrowserGpuChannelHostFactory::EstablishGpuChannelSync(
     CauseForGpuLaunch cause_for_gpu_launch) {
-  EstablishGpuChannel(cause_for_gpu_launch, base::Closure());
+  EstablishGpuChannel(cause_for_gpu_launch,
+                      gpu::GpuChannelEstablishedCallback());
 
   if (pending_request_.get())
     pending_request_->Wait();
@@ -300,7 +301,7 @@ BrowserGpuChannelHostFactory::EstablishGpuChannelSync(
 
 void BrowserGpuChannelHostFactory::EstablishGpuChannel(
     CauseForGpuLaunch cause_for_gpu_launch,
-    const base::Closure& callback) {
+    const gpu::GpuChannelEstablishedCallback& callback) {
 #if defined(MOJO_RUNNER_CLIENT)
   DCHECK(!shell::ShellIsRemote());
 #endif
@@ -321,7 +322,7 @@ void BrowserGpuChannelHostFactory::EstablishGpuChannel(
 
   if (!callback.is_null()) {
     if (gpu_channel_.get())
-      callback.Run();
+      callback.Run(gpu_channel_);
     else
       established_callbacks_.push_back(callback);
   }
@@ -361,7 +362,7 @@ void BrowserGpuChannelHostFactory::GpuChannelEstablished() {
           "466866 BrowserGpuChannelHostFactory::GpuChannelEstablished2"));
 
   for (size_t n = 0; n < established_callbacks_.size(); n++)
-    established_callbacks_[n].Run();
+    established_callbacks_[n].Run(gpu_channel_);
 
   established_callbacks_.clear();
 }