ContextProvider in OutputSurface

cc/test/fake_layer_tree_host_client.cc

 // Copyright 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 "cc/test/fake_layer_tree_host_client.h"
 
 #include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/output/context_provider.h"
 #include "cc/test/fake_output_surface.h"
 
@@ skipping 14 matching lines @@
       return FakeOutputSurface::CreateDelegatingSoftware(
           make_scoped_ptr(new SoftwareOutputDevice)).PassAs<OutputSurface>();
     }
 
     return FakeOutputSurface::CreateSoftware(
         make_scoped_ptr(new SoftwareOutputDevice)).PassAs<OutputSurface>();
   }
 
   if (use_delegating_renderer_)
     return FakeOutputSurface::CreateDelegating3d().PassAs<OutputSurface>();
-
-  return CreateFakeOutputSurface();
+  return FakeOutputSurface::Create3d().PassAs<OutputSurface>();
 }
 
-scoped_refptr<cc::ContextProvider> FakeLayerTreeHostClient::
+scoped_refptr<ContextProvider> FakeLayerTreeHostClient::
     OffscreenContextProviderForMainThread() {
   if (!main_thread_contexts_.get() ||
       main_thread_contexts_->DestroyedOnMainThread()) {
     main_thread_contexts_ = TestContextProvider::Create();
-    if (!main_thread_contexts_->BindToCurrentThread())
+    if (main_thread_contexts_ && !main_thread_contexts_->BindToCurrentThread())
       main_thread_contexts_ = NULL;
   }
   return main_thread_contexts_;
 }
 
-scoped_refptr<cc::ContextProvider> FakeLayerTreeHostClient::
+scoped_refptr<ContextProvider> FakeLayerTreeHostClient::
     OffscreenContextProviderForCompositorThread() {
   if (!compositor_thread_contexts_.get() ||
       compositor_thread_contexts_->DestroyedOnMainThread())
     compositor_thread_contexts_ = TestContextProvider::Create();
   return compositor_thread_contexts_;
 }
 
 }  // namespace cc