Revert of Fix assorted issues with remote CoreAnimation

ui/gl/gl_gl_api_implementation.h

 // 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.
 
 #ifndef UI_GL_GL_GL_API_IMPLEMENTATION_H_
 #define UI_GL_GL_GL_API_IMPLEMENTATION_H_
 
 #include "base/compiler_specific.h"
 #include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_export.h"
 
 namespace gpu {
 namespace gles2 {
 class GLES2Decoder;
 }
 }
 namespace gfx {
 
 class GLContext;
 class GLSurface;
@@ skipping 90 matching lines @@
   // The real context we're running on.
   GLContext* real_context_;
 
   // The current virtual context.
   GLContext* current_context_;
 
   // The supported extensions being advertised for this virtual context.
   std::string extensions_;
 };
 
-class GL_EXPORT ScopedSetGLToRealGLApi {
- public:
-  ScopedSetGLToRealGLApi();
-  ~ScopedSetGLToRealGLApi();
-
- private:
-  GLApi* old_gl_api_;
-};
-
 }  // namespace gfx
 
 #endif  // UI_GL_GL_GL_API_IMPLEMENTATION_H_