Retract SkDevice a bit more

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 19 matching lines @@
 #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"
+#   include "SkGr.h"
 #   if SK_ANGLE
 #       include "gl/angle/GLTestContext_angle.h"
 #   endif
 #else
 class GrContext;
 #endif
 
 const struct {
     SkColorType         fColorType;
     SkColorProfileType  fProfileType;
@@ skipping 2350 matching lines @@
 #ifdef SK_BUILD_FOR_MAC
     setenv("ANDROID_ROOT", "/android/device/data", 0);
 #endif
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 void application_term() {
     SkEvent::Term();
 }