content: Fix Context creation logic in ContextProviderFactoryImpl.

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/command_line.h"
 #include "base/location.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 194 matching lines @@
 void BrowserGpuChannelHostFactory::Initialize(bool establish_gpu_channel) {
   DCHECK(!instance_);
   instance_ = new BrowserGpuChannelHostFactory();
   if (establish_gpu_channel) {
     instance_->EstablishGpuChannel(gpu::GpuChannelEstablishedCallback());
   }
 }
 
 void BrowserGpuChannelHostFactory::Terminate() {
   DCHECK(instance_);
+
+  // Reset the |instance_| first so we don't receive any more Gpu Channel
+  // initialization requests as we run the existing callbacks.
+  instance_ = NULL;
+
   delete instance_;

[piman, 2016/08/16 22:04:52]

This would delete nullptr, i.e. leak - did you mean to keep intance_ into a
local variable and delete that?

[Khushal, 2016/08/16 22:11:58]

Umm, yes. :l Done.

-  instance_ = NULL;
 }
 
 BrowserGpuChannelHostFactory::BrowserGpuChannelHostFactory()
     : gpu_client_id_(ChildProcessHostImpl::GenerateChildProcessUniqueId()),
       gpu_client_tracing_id_(ChildProcessHost::kBrowserTracingProcessId),
       shutdown_event_(new base::WaitableEvent(
           base::WaitableEvent::ResetPolicy::MANUAL,
           base::WaitableEvent::InitialState::NOT_SIGNALED)),
       gpu_memory_buffer_manager_(
           new BrowserGpuMemoryBufferManager(gpu_client_id_,
@@ skipping 136 matching lines @@
 }
 
 // static
 void BrowserGpuChannelHostFactory::InitializeShaderDiskCacheOnIO(
     int gpu_client_id,
     const base::FilePath& cache_dir) {
   ShaderCacheFactory::GetInstance()->SetCacheInfo(gpu_client_id, cache_dir);
 }
 
 }  // namespace content