Revert of skia: Add 'skia_unittests' test suite for this directory.

skia/ext/platform_canvas_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(awalker): clean up the const/non-const reference handling in this test
 
-#include "skia/ext/platform_canvas.h"
-
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
-#include "skia/ext/platform_device.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkColorPriv.h"
-#include "third_party/skia/include/core/SkPixelRef.h"
 
 #if defined(OS_MACOSX)
 #import <ApplicationServices/ApplicationServices.h>
 #endif
 
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
+#include "base/memory/scoped_ptr.h"
+#include "skia/ext/platform_canvas.h"
+#include "skia/ext/platform_device.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkColorPriv.h"
+#include "third_party/skia/include/core/SkPixelRef.h"
+
 namespace skia {
 
 namespace {
 
 bool IsOfColor(const SkBitmap& bitmap, int x, int y, uint32_t color) {
   // For masking out the alpha values.
   static uint32_t alpha_mask =
       static_cast<uint32_t>(SK_A32_MASK) << SK_A32_SHIFT;
   return (*bitmap.getAddr32(x, y) | alpha_mask) == (color | alpha_mask);
 }
@@ skipping 24 matching lines @@
     }
   }
   return true;
 }
 
 #if !defined(OS_MACOSX)
 // Return true if canvas has something that passes for a rounded-corner
 // rectangle. Basically, we're just checking to make sure that the pixels in the
 // middle are of rect_color and pixels in the corners are of canvas_color.
 bool VerifyRoundedRect(const PlatformCanvas& canvas,
-                       uint32_t canvas_color,
-                       uint32_t rect_color,
-                       int x,
-                       int y,
-                       int w,
-                       int h) {
+                       uint32_t canvas_color, uint32_t rect_color,
+                       int x, int y, int w, int h) {
   SkBaseDevice* device = skia::GetTopDevice(canvas);
   const SkBitmap& bitmap = device->accessBitmap(false);
   SkAutoLockPixels lock(bitmap);
 
   // Check corner points first. They should be of canvas_color.
   if (!IsOfColor(bitmap, x, y, canvas_color)) return false;
   if (!IsOfColor(bitmap, x + w, y, canvas_color)) return false;
   if (!IsOfColor(bitmap, x, y + h, canvas_color)) return false;
   if (!IsOfColor(bitmap, x + w, y, canvas_color)) return false;
 
@@ skipping 37 matching lines @@
 
   CGRect inner_rc = CGRectMake(x, y, w, h);
   // RGBA opaque black
   CGColorRef black = CGColorCreateGenericRGB(0.0, 0.0, 0.0, 1.0);
   CGContextSetFillColorWithColor(context, black);
   CGColorRelease(black);
   CGContextFillRect(context, inner_rc);
 }
 #else
 void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) {
-  NOTIMPLEMENTED();
+  notImplemented();
 }
 #endif
 
 // Clips the contents of the canvas to the given rectangle. This will be
 // intersected with any existing clip.
 void AddClip(PlatformCanvas& canvas, int x, int y, int w, int h) {
   SkRect rect;
   rect.set(SkIntToScalar(x), SkIntToScalar(y),
            SkIntToScalar(x + w), SkIntToScalar(y + h));
   canvas.clipRect(rect);
@@ skipping 305 matching lines @@
 
   sk_bitmap.lockPixels();
   EXPECT_EQ(0xDEED1020, *sk_bitmap.getAddr32(10, 20));
   EXPECT_EQ(0xDEED2030, *sk_bitmap.getAddr32(20, 30));
   EXPECT_EQ(0xDEED3040, *sk_bitmap.getAddr32(30, 40));
   sk_bitmap.unlockPixels();
 }
 
 
 }  // namespace skia