NULL out pending_requests_ when GPU channel fails to be created.

content/browser/gpu/browser_gpu_channel_host_factory.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/gpu/browser_gpu_channel_host_factory.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
@@ skipping 340 matching lines @@
 GpuChannelHost* BrowserGpuChannelHostFactory::GetGpuChannel() {
   if (gpu_channel_ && !gpu_channel_->IsLost())
     return gpu_channel_;
 
   return NULL;
 }
 
 void BrowserGpuChannelHostFactory::GpuChannelEstablished() {
   DCHECK(IsMainThread());
   DCHECK(pending_request_);
-  if (pending_request_->channel_handle().name.empty())
-    return;
-
-  GetContentClient()->SetGpuInfo(pending_request_->gpu_info());
-  gpu_channel_ = GpuChannelHost::Create(this,
-                                        pending_request_->gpu_info(),
-                                        pending_request_->channel_handle(),
-                                        shutdown_event_.get());
+  if (pending_request_->channel_handle().name.empty()) {
+    gpu_channel_ = NULL;

[piman, 2014/05/14 19:08:17]

nit: gpu_channel_ should be NULL here, right? We reset it in
EstablishGpuChannel. DCHECK instead?

+  } else {
+    GetContentClient()->SetGpuInfo(pending_request_->gpu_info());
+    gpu_channel_ = GpuChannelHost::Create(this,
+                                          pending_request_->gpu_info(),
+                                          pending_request_->channel_handle(),
+                                          shutdown_event_.get());
+  }
   gpu_host_id_ = pending_request_->gpu_host_id();
   pending_request_ = NULL;
 
   for (size_t n = 0; n < established_callbacks_.size(); n++)
     established_callbacks_[n].Run();
 
   established_callbacks_.clear();
 }
 
 scoped_ptr<gfx::GpuMemoryBuffer>
@@ skipping 38 matching lines @@
   filter->AddRoute(MSG_ROUTING_CONTROL, handler);
 
   GetIOLoopProxy()->PostTask(
       FROM_HERE,
       base::Bind(&BrowserGpuChannelHostFactory::AddFilterOnIO,
                  gpu_host_id_,
                  filter));
 }
 
 }  // namespace content