Remove WebCompositorSupport::initialize/shutdown dependency from webkit_support::CreateLayerTreeView

webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.cc

 // Copyright 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 "webkit/compositor_bindings/web_layer_tree_view_impl_for_testing.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "cc/context_provider.h"
@@ skipping 15 matching lines @@
 #include "webkit/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/compositor_bindings/web_compositor_support_software_output_device.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/compositor_bindings/web_rendering_stats_impl.h"
 #include "webkit/compositor_bindings/web_to_ccinput_handler_adapter.h"
 #include "webkit/gpu/test_context_provider_factory.h"
 #include "webkit/support/test_webkit_platform_support.h"
 
 namespace WebKit {
 WebLayerTreeViewImplForTesting::WebLayerTreeViewImplForTesting(
-    RenderingType type,
+    webkit_support::LayerTreeViewType type,
     webkit_support::DRTLayerTreeViewClient* client)
     : type_(type),
       client_(client) {}
 
 WebLayerTreeViewImplForTesting::~WebLayerTreeViewImplForTesting() {}
 
 bool WebLayerTreeViewImplForTesting::initialize(
     scoped_ptr<cc::Thread> compositor_thread) {
   cc::LayerTreeSettings settings;
   // Accelerated animations are disabled for layout tests, but enabled for unit
   // tests.
-  settings.acceleratedAnimationEnabled = type_ == FAKE_CONTEXT;
+  settings.acceleratedAnimationEnabled = type_ == webkit_support::FAKE_CONTEXT;
   layer_tree_host_ =
       cc::LayerTreeHost::create(this, settings, compositor_thread.Pass());
   if (!layer_tree_host_.get())
     return false;
   return true;
 }
 
 void WebLayerTreeViewImplForTesting::setSurfaceReady() {
   layer_tree_host_->setSurfaceReady();
 }
@@ skipping 111 matching lines @@
 }
 
 void WebLayerTreeViewImplForTesting::applyScrollAndScale(
     gfx::Vector2d scroll_delta,
     float page_scale) {}
 
 scoped_ptr<cc::OutputSurface>
 WebLayerTreeViewImplForTesting::createOutputSurface() {
   scoped_ptr<cc::OutputSurface> surface;
   switch (type_) {
-    case FAKE_CONTEXT: {
+    case webkit_support::FAKE_CONTEXT: {
       scoped_ptr<WebGraphicsContext3D> context3d(
           new cc::FakeWebGraphicsContext3D);
       surface.reset(new cc::OutputSurface(context3d.Pass()));
       break;
     }
-    case SOFTWARE_CONTEXT: {
+    case webkit_support::SOFTWARE_CONTEXT: {
       using webkit::WebCompositorSupportSoftwareOutputDevice;
       scoped_ptr<WebCompositorSupportSoftwareOutputDevice> software_device =
           make_scoped_ptr(new WebCompositorSupportSoftwareOutputDevice);
       surface.reset(new cc::OutputSurface(
           software_device.PassAs<cc::SoftwareOutputDevice>()));
       break;
     }
-    case MESA_CONTEXT: {
+    case webkit_support::MESA_CONTEXT: {
       scoped_ptr<WebGraphicsContext3D> context3d(
           WebKit::Platform::current()->createOffscreenGraphicsContext3D(
               WebGraphicsContext3D::Attributes()));
       surface.reset(new cc::OutputSurface(context3d.Pass()));
       break;
     }
   }
   return surface.Pass();
 }
 
@@ skipping 23 matching lines @@
       OffscreenContextProviderForMainThread();
 }
 
 scoped_refptr<cc::ContextProvider>
 WebLayerTreeViewImplForTesting::OffscreenContextProviderForCompositorThread() {
   return webkit::gpu::TestContextProviderFactory::GetInstance()->
       OffscreenContextProviderForCompositorThread();
 }
 
 }  // namespace WebKit