Remove Sk prefix from some bench classes.

bench/StackBench.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 "SkBenchmark.h"
+#include "Benchmark.h"
 #include "SkRandom.h"
 
 #include "SkChunkAlloc.h"
 #include "SkDeque.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
 
 // This file has several benchmarks using various data structures to do stack-like things:
 //   - push
 //   - push, immediately pop
 //   - push many, pop all of them
 //   - serial access
 //   - random access
 // When a data structure doesn't suppport an operation efficiently, we leave that combination out.
 // Where possible we hint to the data structure to allocate in 4K pages.
 //
 // These benchmarks may help you decide which data structure to use for a dynamically allocated
 // ordered list of allocations that grows on one end.
 //
 // Current overall winner (01/2014): SkTDArray.
 // It wins every benchmark on every machine I tried (Desktop, Nexus S, Laptop).
 
 template <typename Impl>
-struct StackBench : public SkBenchmark {
+struct StackBench : public Benchmark {
     virtual bool isSuitableFor(Backend b) SK_OVERRIDE { return b == kNonRendering_Backend; }
     virtual const char* onGetName() SK_OVERRIDE { return Impl::kName; }
     virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE { Impl::bench(loops); }
 };
 
 #define BENCH(name)                                                          \
     struct name { static const char* const kName; static void bench(int); }; \
     const char* const name::kName = #name;                                   \
     DEF_BENCH(return new StackBench<name>();)                                \
     void name::bench(int loops)
@@ skipping 127 matching lines @@
     SkTArray<int, true> s;
     for (int i = 0; i < K*loops; i++) s.push_back(i);
     for (int i = 0; i < K*loops; i++) s.pop_back();
 }
 
 BENCH(TDArray_PushAllPopAll) {
     SkTDArray<int> s;
     for (int i = 0; i < K*loops; i++) s.push(i);
     for (int i = 0; i < K*loops; i++) s.pop();
 }