Refactor WebGraphicsContext3DInProcess and TestWebGraphicsContext3D

webkit/tools/test_shell/test_shell_webkit_init.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 "webkit/tools/test_shell/test_shell_webkit_init.h"
 
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "media/base/media.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
@@ skipping 282 matching lines @@
     const WebKit::WebString& keyPath) {
   return WebKit::WebIDBKey::injectIDBKeyIntoSerializedValue(
       key, value, WebKit::WebIDBKeyPath::create(keyPath));
 }
 
 WebKit::WebSharedWorkerRepository*
 TestShellWebKitInit::sharedWorkerRepository() {
   return NULL;
 }
 
-WebKit::WebGraphicsContext3D* TestShellWebKitInit::createGraphicsContext3D() {
-  return new webkit::gpu::WebGraphicsContext3DInProcessImpl(
-      gfx::kNullPluginWindow, NULL);
-}
-
 WebKit::WebGraphicsContext3D*
 TestShellWebKitInit::createOffscreenGraphicsContext3D(
     const WebKit::WebGraphicsContext3D::Attributes& attributes) {
-  scoped_ptr<WebGraphicsContext3D> context(
-      new webkit::gpu::WebGraphicsContext3DInProcessImpl(
-          gfx::kNullPluginWindow, NULL));
-  if (!context->initialize(attributes, NULL, false))
-    return NULL;
-  return context.release();
+  return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
+          attributes, NULL, false);
 }
 
 void TestShellWebKitInit::GetPlugins(
     bool refresh, std::vector<webkit::WebPluginInfo>* plugins) {
   if (refresh)
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   webkit::npapi::PluginList::Singleton()->GetPlugins(plugins);
   // Don't load the forked TestNetscapePlugIn in the chromium code, use
   // the copy in webkit.org's repository instead.
   const FilePath::StringType kPluginBlackList[] = {
@@ skipping 16 matching lines @@
     const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
   return SimpleResourceLoaderBridge::Create(request_info);
 }
 
 webkit_glue::WebSocketStreamHandleBridge*
 TestShellWebKitInit::CreateWebSocketBridge(
     WebKit::WebSocketStreamHandle* handle,
     webkit_glue::WebSocketStreamHandleDelegate* delegate) {
   return SimpleSocketStreamBridge::Create(handle, delegate);
 }