Move macros from TestClassDef.h to Test.h

tests/ImageCacheTest.cpp

  /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
-#include "TestClassDef.h"
 #include "SkDiscardableMemory.h"
 #include "SkScaledImageCache.h"
 
 static void make_bm(SkBitmap* bm, int w, int h) {
     bm->setConfig(SkBitmap::kARGB_8888_Config, w, h);
     bm->allocPixels();
 }
 
 static const int COUNT = 10;
 static const int DIM = 256;
@@ skipping 96 matching lines @@
     SkBitmap scaled;
     scaled.setConfig(SkBitmap::kARGB_8888_Config, 20, 20);
     scaled.allocPixels();
 
     SkScaledImageCache::ID* id1 = cache.addAndLock(original, 0.5f, 0.5f, scaled);
     SkScaledImageCache::ID* id2 = cache.addAndLock(original, 0.5f, 0.5f, scaled);
     // We don't really care if id1 == id2 as long as unlocking both works.
     cache.unlock(id1);
     cache.unlock(id2);
 }