Add back convolver_unittest.cc and image_operations_unittest.cc....

skia/ext/platform_canvas_unittest.cc

Index: skia/ext/platform_canvas_unittest.cc
===================================================================
--- skia/ext/platform_canvas_unittest.cc	(revision 8440)
+++ skia/ext/platform_canvas_unittest.cc	(working copy)
@@ -6,9 +6,7 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
-#else
+#if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
@@ -50,8 +48,7 @@
 
 // Checks whether there is a white canvas with a black square at the given
 // location in pixels (not in the canvas coordinate system).
-// TODO(ericroman): rename Square to Rect
-bool VerifyBlackSquare(const PlatformCanvas& canvas, int x, int y, int w, int h) {
+bool VerifyBlackRect(const PlatformCanvas& canvas, int x, int y, int w, int h) {
   return VerifyRect(canvas, SK_ColorWHITE, SK_ColorBLACK, x, y, w, h);
 }
 
@@ -161,7 +158,7 @@
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas.drawColor(SK_ColorBLACK);
   }
-  EXPECT_TRUE(VerifyBlackSquare(canvas, kLayerX, kLayerY, kLayerW, kLayerH));
+  EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX, kLayerY, kLayerW, kLayerH));
 }
 
 // Test native clipping.
@@ -202,7 +199,7 @@
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, 0, 0, 100, 100);
   }
-  EXPECT_TRUE(VerifyBlackSquare(canvas, kLayerX, kLayerY, kLayerW, kLayerH));
+  EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX, kLayerY, kLayerW, kLayerH));
 
   // Make a layer and fill it partially to make sure the translation is correct.
   canvas.drawColor(SK_ColorWHITE);
@@ -210,7 +207,7 @@
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
   }
-  EXPECT_TRUE(VerifyBlackSquare(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
+  EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 
   // Add a clip on the layer and fill to make sure clip is correct.
   canvas.drawColor(SK_ColorWHITE);
@@ -221,7 +218,7 @@
     DrawNativeRect(canvas, 0, 0, 100, 100);
     canvas.restore();
   }
-  EXPECT_TRUE(VerifyBlackSquare(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
+  EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 
   // Add a clip and then make the layer to make sure the clip is correct.
   canvas.drawColor(SK_ColorWHITE);
@@ -232,7 +229,7 @@
     DrawNativeRect(canvas, 0, 0, 100, 100);
   }
   canvas.restore();
-  EXPECT_TRUE(VerifyBlackSquare(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
+  EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 }
 
 // Test that translation + make layer works properly.
@@ -250,8 +247,8 @@
     DrawNativeRect(canvas, 0, 0, 100, 100);
   }
   canvas.restore();
-  EXPECT_TRUE(VerifyBlackSquare(canvas, kLayerX + 1, kLayerY + 1,
-                                kLayerW, kLayerH));
+  EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX + 1, kLayerY + 1,
+                              kLayerW, kLayerH));
 
   // Translate then make the layer.
   canvas.drawColor(SK_ColorWHITE);
@@ -262,8 +259,8 @@
     DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
   }
   canvas.restore();
-  EXPECT_TRUE(VerifyBlackSquare(canvas, kInnerX + 1, kInnerY + 1,
-                                kInnerW, kInnerH));
+  EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX + 1, kInnerY + 1,
+                              kInnerW, kInnerH));
 
   // Make the layer then translate.
   canvas.drawColor(SK_ColorWHITE);
@@ -274,8 +271,8 @@
     DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
   }
   canvas.restore();
-  EXPECT_TRUE(VerifyBlackSquare(canvas, kInnerX + 1, kInnerY + 1,
-                                kInnerW, kInnerH));
+  EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX + 1, kInnerY + 1,
+                              kInnerW, kInnerH));
 
   // Translate both before and after, and have a clip.
   canvas.drawColor(SK_ColorWHITE);
@@ -288,9 +285,8 @@
     DrawNativeRect(canvas, 0, 0, 100, 100);
   }
   canvas.restore();
-  EXPECT_TRUE(VerifyBlackSquare(canvas, kInnerX + 2, kInnerY + 2,
-                                kInnerW, kInnerH));
+  EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX + 2, kInnerY + 2,
+                              kInnerW, kInnerH));
 }
 
 }  // namespace skia
-