aura: Clean up compositor initialization/destruction.

content/browser/aura/gpu_process_transport_factory.cc

 // Copyright (c) 2013 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/aura/gpu_process_transport_factory.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 301 matching lines @@
     return;
   PerCompositorData* data = it->second;
   DCHECK(data);
   GpuSurfaceTracker::Get()->RemoveSurface(data->surface_id);
   delete data;
   per_compositor_data_.erase(it);
   if (per_compositor_data_.empty())
     gl_helper_.reset();
 }
 
+bool GpuProcessTransportFactory::UsesTestContexts() { return false; }
+
 ui::ContextFactory* GpuProcessTransportFactory::AsContextFactory() {
   return this;
 }
 
 gfx::GLSurfaceHandle GpuProcessTransportFactory::CreateSharedSurfaceHandle() {
   CreateSharedContextLazy();
   if (!shared_contexts_main_thread_ ||
       !shared_contexts_main_thread_->Context3d())
     return gfx::GLSurfaceHandle();
   gfx::GLSurfaceHandle handle = gfx::GLSurfaceHandle(
@@ skipping 66 matching lines @@
 }
 
 scoped_refptr<cc::ContextProvider>
 GpuProcessTransportFactory::OffscreenContextProviderForMainThread() {
   if (!shared_contexts_main_thread_.get() ||
       shared_contexts_main_thread_->DestroyedOnMainThread()) {
     shared_contexts_main_thread_ = ContextProviderCommandBuffer::Create(
         base::Bind(&GpuProcessTransportFactory::
                        CreateOffscreenCommandBufferContext,
                    base::Unretained(this)));
-    shared_contexts_main_thread_->SetLostContextCallback(base::Bind(
-        &GpuProcessTransportFactory::
-            OnLostMainThreadSharedContextInsideCallback,
-        callback_factory_.GetWeakPtr()));
+    if (shared_contexts_main_thread_) {
+      shared_contexts_main_thread_->SetLostContextCallback(base::Bind(
+          &GpuProcessTransportFactory::
+              OnLostMainThreadSharedContextInsideCallback,
+          callback_factory_.GetWeakPtr()));
 
-    if (shared_contexts_main_thread_.get() &&
-        !shared_contexts_main_thread_->BindToCurrentThread())
-      shared_contexts_main_thread_ = NULL;
+      if (!shared_contexts_main_thread_->BindToCurrentThread())
+        shared_contexts_main_thread_ = NULL;
+    }
   }
   return shared_contexts_main_thread_;
 }
 
 scoped_refptr<cc::ContextProvider>
 GpuProcessTransportFactory::OffscreenContextProviderForCompositorThread() {
   if (!shared_contexts_compositor_thread_.get() ||
       shared_contexts_compositor_thread_->DestroyedOnMainThread()) {
     shared_contexts_compositor_thread_ = ContextProviderCommandBuffer::Create(
         base::Bind(&GpuProcessTransportFactory::
@@ skipping 90 matching lines @@
   shared_contexts_main_thread_ = NULL;
 
   scoped_ptr<GLHelper> old_helper(gl_helper_.release());
 
   FOR_EACH_OBSERVER(ImageTransportFactoryObserver,
                     observer_list_,
                     OnLostResources());
 }
 
 }  // namespace content