Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

samplecode/SampleApp.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleApp.h"
 
 #include "OverView.h"
@@ skipping 15 matching lines @@
 #include "SkStream.h"
 #include "SkSurface.h"
 #include "SkTemplates.h"
 #include "SkTSort.h"
 #include "SkTime.h"
 #include "SkTypeface.h"
 #include "SkWindow.h"
 #include "sk_tool_utils.h"
 
 #if SK_SUPPORT_GPU
-#   include "gl/GrGLInterface.h"
-#   include "gl/GrGLUtil.h"
-#   include "GrRenderTarget.h"
-#   include "GrContext.h"
-#   include "SkGpuDevice.h"
-#   if SK_ANGLE
-#       include "gl/angle/GLContext_angle.h"
-#   endif
+#include "gl/GrGLInterface.h"
+#include "gl/GrGLUtil.h"
+#include "GrRenderTarget.h"
+#include "GrContext.h"
+#include "SkGpuDevice.h"
 #else
 class GrContext;
 #endif
 
 const struct {
     SkColorType         fColorType;
     SkColorProfileType  fProfileType;
     const char*         fName;
 } gConfig[] = {
     { kN32_SkColorType,      kLinear_SkColorProfileType, "L32" },
@@ skipping 175 matching lines @@
         SkASSERT(nullptr == fCurIntf);
         SkAutoTUnref<const GrGLInterface> glInterface;
         switch (win->getDeviceType()) {
             case kRaster_DeviceType:    // fallthrough
             case kGPU_DeviceType:
                 // all these guys use the native interface
                 glInterface.reset(GrGLCreateNativeInterface());
                 break;
 #if SK_ANGLE
             case kANGLE_DeviceType:
-                glInterface.reset(sk_gpu_test::CreateANGLEGLInterface());
+                glInterface.reset(GrGLCreateANGLEInterface());
                 break;
 #endif // SK_ANGLE
 #if SK_COMMAND_BUFFER
             case kCommandBuffer_DeviceType:
                 glInterface.reset(GrGLCreateCommandBufferInterface());
                 break;
 #endif // SK_COMMAND_BUFFER
             default:
                 SkASSERT(false);
                 break;
@@ skipping 2083 matching lines @@
 #ifdef SK_BUILD_FOR_MAC
     setenv("ANDROID_ROOT", "/android/device/data", 0);
 #endif
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 void application_term() {
     SkEvent::Term();
 }