| 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 aff2083e6deff4b7e3fe02f0b11d17a907cee9c5..970ea353fc59f9b66588752c7189f3f1b8394565 100644
|
| --- a/content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| +++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
|
| @@ -20,6 +20,7 @@
|
| #include "content/browser/gpu/gpu_process_host.h"
|
| #include "content/browser/gpu/shader_disk_cache.h"
|
| #include "content/common/child_process_host_impl.h"
|
| +#include "content/common/mojo/mojo_shell_connection_impl.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| #include "content/public/browser/gpu_data_manager.h"
|
| @@ -29,6 +30,10 @@
|
| #include "ipc/ipc_channel_handle.h"
|
| #include "ipc/message_filter.h"
|
|
|
| +#if defined(MOJO_RUNNER_CLIENT)
|
| +#include "services/shell/runner/common/client_util.h"
|
| +#endif
|
| +
|
| namespace content {
|
|
|
| BrowserGpuChannelHostFactory* BrowserGpuChannelHostFactory::instance_ = NULL;
|
| @@ -297,6 +302,9 @@ BrowserGpuChannelHostFactory::EstablishGpuChannelSync(
|
| void BrowserGpuChannelHostFactory::EstablishGpuChannel(
|
| CauseForGpuLaunch cause_for_gpu_launch,
|
| const base::Closure& callback) {
|
| +#if defined(MOJO_RUNNER_CLIENT)
|
| + DCHECK(!shell::ShellIsRemote());
|
| +#endif
|
| if (gpu_channel_.get() && gpu_channel_->IsLost()) {
|
| DCHECK(!pending_request_.get());
|
| // Recreate the channel if it has been lost.
|
|
|