Refactor WebGraphicsContext3DInProcess and TestWebGraphicsContext3D

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index c8eb6106082a7d61f915f9cd3fcf3912b8c4bb16..6555859300adea8a7722cc7b36d95ddea1bcef64 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1480,20 +1480,16 @@ WebGraphicsContext3D* RenderViewImpl::createGraphicsContext3D(
   // The WebGraphicsContext3DInProcessImpl code path is used for
   // layout tests (though not through this code) as well as for
   // debugging and bringing up new ports.
-  scoped_ptr<WebGraphicsContext3D> context;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) {
-    context.reset(new webkit::gpu::WebGraphicsContext3DInProcessImpl(
-        gfx::kNullPluginWindow, NULL));
+    return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView(
+          attributes, webview(), direct);
   } else {
-#if defined(ENABLE_GPU)
-    context.reset(new WebGraphicsContext3DCommandBufferImpl());
-#else
-    return NULL;
-#endif
+    scoped_ptr<WebGraphicsContext3D> context(
+        new WebGraphicsContext3DCommandBufferImpl());
+    if (!context->initialize(attributes, webview(), direct))
+      return NULL;
+    return context.release();
   }
-  if (!context->initialize(attributes, webview(), direct))
-    return NULL;
-  return context.release();
 }
 
 void RenderViewImpl::didAddMessageToConsole(