Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

ui/gl/gl_context.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 <string>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
@@ skipping 88 matching lines @@
   std::string delimited_name(name);
   delimited_name += " ";
 
   return extensions.find(delimited_name) != std::string::npos;
 }
 
 const GLVersionInfo* GLContext::GetVersionInfo() {
   if(!version_info_) {
     std::string version = GetGLVersion();
     std::string renderer = GetGLRenderer();
-    version_info_ =
-        make_scoped_ptr(new GLVersionInfo(version.c_str(), renderer.c_str()));
+    version_info_ = scoped_ptr<GLVersionInfo>(
+        new GLVersionInfo(version.c_str(), renderer.c_str()));
   }
   return version_info_.get();
 }
 
 GLShareGroup* GLContext::share_group() {
   return share_group_.get();
 }
 
 bool GLContext::LosesAllContextsOnContextLost() {
   switch (GetGLImplementation()) {
@@ skipping 92 matching lines @@
     : GLContext(share_group) {}
 
 GLContextReal::~GLContextReal() {}
 
 void GLContextReal::SetCurrent(GLSurface* surface) {
   GLContext::SetCurrent(surface);
   current_real_context_.Pointer()->Set(surface ? this : NULL);
 }
 
 }  // namespace gfx