Fix some presubmit warnings.

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"
@@ skipping 10 matching lines @@
 static void test_cache(skiatest::Reporter* reporter, SkScaledImageCache& cache,
                        bool testPurge) {
     SkScaledImageCache::ID* id;
 
     SkBitmap bm[COUNT];
 
     const SkScalar scale = 2;
     for (int i = 0; i < COUNT; ++i) {
         make_bm(&bm[i], DIM, DIM);
     }
-    
+
     for (int i = 0; i < COUNT; ++i) {
         SkBitmap tmp;
 
         SkScaledImageCache::ID* id = cache.findAndLock(bm[i], scale, scale, &tmp);
         REPORTER_ASSERT(reporter, NULL == id);
 
         make_bm(&tmp, DIM, DIM);
         id = cache.addAndLock(bm[i], scale, scale, tmp);
         REPORTER_ASSERT(reporter, NULL != id);
 
@@ skipping 74 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);
 }