Revved to chromium 4dfb55c9cf0950b8bac8b10070c9b8f3e7de66c2 refs/remotes/origin/HEAD
diff --git a/skia/ext/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc
index 73429fc..6152731 100644
--- a/skia/ext/image_operations_unittest.cc
+++ b/skia/ext/image_operations_unittest.cc
@@ -535,7 +535,7 @@
 
   // For each method, downscale by 16 in each dimension,
   // and check each tested pixel against the expected average color.
-  bool all_methods_ok ALLOW_UNUSED = true;
+  bool all_methods_ok = true;
 
   for (size_t method_index = 0;
        method_index < arraysize(tested_methods);
@@ -550,11 +550,11 @@
     }
   }
 
-#if DEBUG_BITMAP_GENERATION
   if (!all_methods_ok) {
+#if DEBUG_BITMAP_GENERATION
     SaveBitmapToPNG(src, "/tmp/ResizeShouldAverageColors_src.png");
-  }
 #endif  // #if DEBUG_BITMAP_GENERATION
+  }
 }