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 715eb204546209565072ed8e460474547beaa640..9a0013a6d27b65b3882f898b647a7f83bc8f4f83 100644 |
--- a/content/browser/gpu/browser_gpu_channel_host_factory.cc |
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc |
@@ -358,14 +358,15 @@ GpuChannelHost* BrowserGpuChannelHostFactory::GetGpuChannel() { |
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()) { |
+ DCHECK(!gpu_channel_); |
+ } 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; |