Reverting 7318.

skia/ext/vector_device.h

 // Copyright (c) 2006-2008 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.
 
-#ifndef VectorDevice_h
-#define VectorDevice_h
+#ifndef SKIA_EXT_VECTOR_DEVICE_H_
+#define SKIA_EXT_VECTOR_DEVICE_H_
 
-#include "base/basictypes.h"
 #include "skia/ext/platform_device_win.h"
 #include "SkMatrix.h"
 #include "SkRegion.h"
 
 namespace skia {
 
 // A device is basically a wrapper around SkBitmap that provides a surface for
 // SkCanvas to draw into. This specific device is not not backed by a surface
 // and is thus unreadable. This is because the backend is completely vectorial.
 // This device is a simple wrapper over a Windows device context (HDC) handle.
@@ skipping 84 matching lines @@
 
   // The current clipping
   SkRegion clip_region_;
 
   // Previously selected brush before the current drawing.
   HGDIOBJ previous_brush_;
 
   // Previously selected pen before the current drawing.
   HGDIOBJ previous_pen_;
 
-  DISALLOW_COPY_AND_ASSIGN(VectorDevice);
+  // Copy & assign are not supported.
+  VectorDevice(const VectorDevice&);
+  const VectorDevice& operator=(const VectorDevice&);
 };
 
 }  // namespace skia
 
-#endif  // VectorDevice_h
+#endif  // SKIA_EXT_VECTOR_DEVICE_H_