Revert of Add direct getter for GrCaps to GrContext.

bench/nanobench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <ctype.h>
 
 #include "nanobench.h"
@@ skipping 25 matching lines @@
 #include "SkString.h"
 #include "SkSurface.h"
 #include "SkTaskGroup.h"
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
     #include "nanobenchAndroid.h"
 #endif
 
 #if SK_SUPPORT_GPU
     #include "gl/GrGLDefines.h"
-    #include "GrCaps.h"
     #include "GrContextFactory.h"
     SkAutoTDelete<GrContextFactory> gGrFactory;
 #endif
 
     struct GrContextOptions;
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 static const int kAutoTuneLoops = 0;
 
@@ skipping 309 matching lines @@
     return false;
 }
 
 #if SK_SUPPORT_GPU
 static bool is_gpu_config_allowed(const char* name, GrContextFactory::GLContextType ctxType,
                                   int sampleCnt) {
     if (!is_cpu_config_allowed(name)) {
         return false;
     }
     if (const GrContext* ctx = gGrFactory->get(ctxType)) {
-        return sampleCnt <= ctx->caps()->maxSampleCount();
+        return sampleCnt <= ctx->getMaxSampleCount();
     }
     return false;
 }
 #endif
 
 #if SK_SUPPORT_GPU
 #define kBogusGLContextType GrContextFactory::kNative_GLContextType
 #else
 #define kBogusGLContextType 0
 #endif
@@ skipping 642 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif