Refactor WebGraphicsContext3DInProcess and TestWebGraphicsContext3D

ui/gfx/compositor/compositor_cc.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 "ui/gfx/compositor/compositor_cc.h"
 
 #include "base/command_line.h"
 #include "third_party/skia/include/images/SkImageEncoder.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
@@ skipping 244 matching lines @@
                                        float scaleFactor) {
 }
 
 void CompositorCC::applyScrollDelta(const WebKit::WebSize&) {
 }
 
 WebKit::WebGraphicsContext3D* CompositorCC::createContext3D() {
   WebKit::WebGraphicsContext3D* context;
   if (test_compositor_enabled) {
     // Use context that results in no rendering to the screen.
-    context = new TestWebGraphicsContext3D();
+    TestWebGraphicsContext3D* test_context = new TestWebGraphicsContext3D();
+    test_context->initialize();
+    context = test_context;
   } else {
     gfx::GLShareGroup* share_group =
         SharedResourcesCC::GetInstance()->GetShareGroup();
-    context = new webkit::gpu::WebGraphicsContext3DInProcessImpl(
-        widget_, share_group);
+    WebKit::WebGraphicsContext3D::Attributes attrs;
+    context = webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWindow(
+        attrs, widget_, share_group);
   }
-  WebKit::WebGraphicsContext3D::Attributes attrs;
-  context->initialize(attrs, 0, true);
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switches::kDisableUIVsync)) {
     context->makeContextCurrent();
     gfx::GLContext* gl_context = gfx::GLContext::GetCurrent();
     gl_context->SetSwapInterval(1);
     gl_context->ReleaseCurrent(NULL);
   }
 
   return context;
@@ skipping 21 matching lines @@
       switches::kDisableTestCompositor)) {
     test_compositor_enabled = true;
   }
 }
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   test_compositor_enabled = false;
 }
 
 }  // namespace ui