| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 7d2eaa5755a987b141094ab619d33f4f241b8996..5f429fd120f472eba673db2370fcce2cad3bb0b7 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -1228,14 +1228,14 @@ int BrowserMainLoop::BrowserThreadsStarted() {
|
| shell::ShellIsRemote()) {
|
| established_gpu_channel = always_uses_gpu = false;
|
| }
|
| - BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
|
| - ImageTransportFactory::Initialize();
|
| -
|
| gpu::GpuChannelEstablishFactory* factory =
|
| GetContentClient()->browser()->GetGpuChannelEstablishFactory();
|
| - if (!factory)
|
| + if (!factory) {
|
| + BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
|
| factory = BrowserGpuChannelHostFactory::instance();
|
| + }
|
| DCHECK(factory);
|
| + ImageTransportFactory::Initialize();
|
| ImageTransportFactory::GetInstance()->SetGpuChannelEstablishFactory(factory);
|
| #if defined(USE_AURA)
|
| bool use_mus_in_renderer = base::CommandLine::ForCurrentProcess()->HasSwitch(
|
|
|