cc: Switch it to use DISALLOW_COPY_AND_ASSIGN macro from base/ library.

cc/CCResourceProvider.h

Index: cc/CCResourceProvider.h
diff --git a/cc/CCResourceProvider.h b/cc/CCResourceProvider.h
index 91a6d77da10f6d75a4d14ed6303ef50e65b1e0c1..a50c95286b3f7326966837cb2bc29ca9932d9730 100644
--- a/cc/CCResourceProvider.h
+++ b/cc/CCResourceProvider.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #ifndef CCResourceProvider_h
 #define CCResourceProvider_h
 
+#include "base/basictypes.h"
 #include "CCGraphicsContext.h"
 #include "GraphicsContext3D.h"
 #include "IntSize.h"
@@ -34,7 +34,6 @@ class TextureUploader;
 // Thread-safety notes: this class is not thread-safe and can only be called
 // from the thread it was created on (in practice, the compositor thread).
 class CCResourceProvider {
-    WTF_MAKE_NONCOPYABLE(CCResourceProvider);
 public:
     typedef unsigned ResourceId;
     typedef Vector<ResourceId> ResourceIdArray;
@@ -159,7 +158,6 @@ public:
     // that they only use GL locks on GL resources, etc, and this is enforced
     // by assertions.
     class ScopedReadLockGL {
-        WTF_MAKE_NONCOPYABLE(ScopedReadLockGL);
     public:
         ScopedReadLockGL(CCResourceProvider*, CCResourceProvider::ResourceId);
         ~ScopedReadLockGL();
@@ -170,10 +168,11 @@ public:
         CCResourceProvider* m_resourceProvider;
         CCResourceProvider::ResourceId m_resourceId;
         unsigned m_textureId;
+
+        DISALLOW_COPY_AND_ASSIGN(ScopedReadLockGL);
     };
 
     class ScopedWriteLockGL {
-        WTF_MAKE_NONCOPYABLE(ScopedWriteLockGL);
     public:
         ScopedWriteLockGL(CCResourceProvider*, CCResourceProvider::ResourceId);
         ~ScopedWriteLockGL();
@@ -184,10 +183,11 @@ public:
         CCResourceProvider* m_resourceProvider;
         CCResourceProvider::ResourceId m_resourceId;
         unsigned m_textureId;
+
+        DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockGL);
     };
 
     class ScopedReadLockSoftware {
-        WTF_MAKE_NONCOPYABLE(ScopedReadLockSoftware);
     public:
         ScopedReadLockSoftware(CCResourceProvider*, CCResourceProvider::ResourceId);
         ~ScopedReadLockSoftware();
@@ -198,10 +198,11 @@ public:
         CCResourceProvider* m_resourceProvider;
         CCResourceProvider::ResourceId m_resourceId;
         SkBitmap m_skBitmap;
+
+        DISALLOW_COPY_AND_ASSIGN(ScopedReadLockSoftware);
     };
 
     class ScopedWriteLockSoftware {
-        WTF_MAKE_NONCOPYABLE(ScopedWriteLockSoftware);
     public:
         ScopedWriteLockSoftware(CCResourceProvider*, CCResourceProvider::ResourceId);
         ~ScopedWriteLockSoftware();
@@ -213,6 +214,8 @@ public:
         CCResourceProvider::ResourceId m_resourceId;
         SkBitmap m_skBitmap;
         OwnPtr<SkCanvas> m_skCanvas;
+
+        DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockSoftware);
     };
 
 private:
@@ -283,6 +286,8 @@ private:
     static int64 m_commitCountAtLastPtmReduceMemoryOnImplThread;
     static int64 m_resourceProviderCreatedCount;
     static int64 m_resourceProviderDestroyedCount;
+
+    DISALLOW_COPY_AND_ASSIGN(CCResourceProvider);
 };
 
 }