Update from https://crrev.com/312398

ui/gl/gl_context_ozone.cc

Index: ui/gl/gl_context_ozone.cc
diff --git a/ui/gl/gl_context_win.cc b/ui/gl/gl_context_ozone.cc
similarity index 64%
copy from ui/gl/gl_context_win.cc
copy to ui/gl/gl_context_ozone.cc
index a69fcd222c1ead2e2310a9a0914fbbabbe95c73b..776e114e3dae62c3b034b3bc0e5f52e6374c2003 100644
--- a/ui/gl/gl_context_win.cc
+++ b/ui/gl/gl_context_ozone.cc
@@ -1,54 +1,42 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 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 "ui/gl/gl_context.h"
 
-#include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
+#include "base/sys_info.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context_egl.h"
 #include "ui/gl/gl_context_osmesa.h"
 #include "ui/gl/gl_context_stub.h"
-#include "ui/gl/gl_context_wgl.h"
 #include "ui/gl/gl_implementation.h"
-#include "ui/gl/gl_surface_egl.h"
-#include "ui/gl/gl_surface_osmesa.h"
-#include "ui/gl/gl_surface_stub.h"
-#include "ui/gl/gl_surface_wgl.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
+// static
 scoped_refptr<GLContext> GLContext::CreateGLContext(
     GLShareGroup* share_group,
     GLSurface* compatible_surface,
     GpuPreference gpu_preference) {
-  TRACE_EVENT0("gpu", "GLContext::CreateGLContext");
+
   switch (GetGLImplementation()) {
+    case kGLImplementationMockGL:
+      return scoped_refptr<GLContext>(new GLContextStub());
     case kGLImplementationOSMesaGL: {
       scoped_refptr<GLContext> context(new GLContextOSMesa(share_group));
       if (!context->Initialize(compatible_surface, gpu_preference))
         return NULL;
-
       return context;
     }
     case kGLImplementationEGLGLES2: {
       scoped_refptr<GLContext> context(new GLContextEGL(share_group));
       if (!context->Initialize(compatible_surface, gpu_preference))
         return NULL;
-
       return context;
     }
-    case kGLImplementationDesktopGL: {
-      scoped_refptr<GLContext> context(new GLContextWGL(share_group));
-      if (!context->Initialize(compatible_surface, gpu_preference))
-        return NULL;
-
-      return context;
-    }
-    case kGLImplementationMockGL:
-      return new GLContextStub;
     default:
       NOTREACHED();
       return NULL;
@@ -56,3 +44,4 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(
 }
 
 }  // namespace gfx
+