Remove ::create factory functions from objects created via WebCompositorSupport

content/shell/android/shell_manager.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/shell/android/shell_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/android/draw_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/shell/shell.h"
 #include "googleurl/src/gurl.h"
 #include "jni/ShellManager_jni.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
 #include "ui/gfx/size.h"
 
 #include <android/native_window_jni.h>
 
 using base::android::ScopedJavaLocalRef;
 using content::Compositor;
 using content::DrawDelegate;
 
 namespace {
@@ skipping 37 matching lines @@
 
 namespace content {
 
 jobject CreateShellView() {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!GetCompositor()) {
     Compositor::Initialize();
     g_global_state.Get().compositor.reset(Compositor::Create(
         &g_global_state.Get().client));
     DCHECK(!g_global_state.Get().root_layer.get());
-    g_global_state.Get().root_layer.reset(WebKit::WebLayer::create());
+    WebKit::WebCompositorSupport* compositor_support =
+        WebKit::Platform::current()->compositorSupport();
+    g_global_state.Get().root_layer.reset(compositor_support->createLayer());
   }
   return Java_ShellManager_createShell(
       env, g_global_state.Get().j_obj.obj()).Release();
 }
 
 // Register native methods
 bool RegisterShellManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
@@ skipping 38 matching lines @@
 void ShellAttachLayer(WebKit::WebLayer* layer) {
   g_global_state.Get().root_layer->addChild(layer);
 }
 
 
 void ShellRemoveLayer(WebKit::WebLayer* layer) {
   layer->removeFromParent();
 }
 
 }  // namespace content