Introduce separate client and init path for single-threaded cc

cc/trees/layer_tree_host_unittest_context.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/trees/layer_tree_host.h"
 
 #include "base/basictypes.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
@@ skipping 1761 matching lines @@
 
   // FakeLayerTreeHostClient implementation.
   virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback)
       OVERRIDE {
     return scoped_ptr<OutputSurface>();
   }
 
   void RunTest(bool threaded,
                bool delegating_renderer,
                bool impl_side_painting) {
-    scoped_ptr<base::Thread> impl_thread;
+    LayerTreeSettings settings;
+    settings.impl_side_painting = impl_side_painting;
     if (threaded) {
-      impl_thread.reset(new base::Thread("LayerTreeTest"));
+      scoped_ptr<base::Thread> impl_thread(new base::Thread("LayerTreeTest"));
       ASSERT_TRUE(impl_thread->Start());
       ASSERT_TRUE(impl_thread->message_loop_proxy().get());
+      scoped_ptr<LayerTreeHost> layer_tree_host = LayerTreeHost::CreateThreaded(
+          this, NULL, settings, impl_thread->message_loop_proxy());
+      EXPECT_FALSE(layer_tree_host);
+    } else {
+      scoped_ptr<LayerTreeHost> layer_tree_host =
+          LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings);
+      EXPECT_FALSE(layer_tree_host);
     }
-
-    LayerTreeSettings settings;
-    settings.impl_side_painting = impl_side_painting;
-    scoped_ptr<LayerTreeHost> layer_tree_host = LayerTreeHost::Create(
-        this,
-        NULL,
-        settings,
-        impl_thread ? impl_thread->message_loop_proxy() : NULL);
-    EXPECT_FALSE(layer_tree_host);
   }
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostTestCannotCreateIfCannotCreateOutputSurface);
 
 class UIResourceLostTest : public LayerTreeHostContextTest {
  public:
   UIResourceLostTest() : time_step_(0) {}
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
@@ skipping 484 matching lines @@
  protected:
   FakeContentLayerClient client_;
   scoped_refptr<FakeContentLayer> layer_;
   int num_commits_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostContextTestSurfaceCreateCallback);
 
 }  // namespace
 }  // namespace cc