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

cc/CCRendererSoftware.h

Index: cc/CCRendererSoftware.h
diff --git a/cc/CCRendererSoftware.h b/cc/CCRendererSoftware.h
index a7b36d527ef1f9b4238971964f6c2d265b54606c..2ad688fc0a1f6af548c65f4f1bdd60ac8d46b4e0 100644
--- a/cc/CCRendererSoftware.h
+++ b/cc/CCRendererSoftware.h
@@ -5,6 +5,7 @@
 #ifndef CCRendererSoftware_h
 #define CCRendererSoftware_h
 
+#include "base/basictypes.h"
 #include "CCDirectRenderer.h"
 #include "CCLayerTreeHost.h"
 #include <public/WebCompositorSoftwareOutputDevice.h>
@@ -19,7 +20,6 @@ class CCTextureDrawQuad;
 class CCTileDrawQuad;
 
 class CCRendererSoftware : public CCDirectRenderer {
-    WTF_MAKE_NONCOPYABLE(CCRendererSoftware);
 public:
     static PassOwnPtr<CCRendererSoftware> create(CCRendererClient*, CCResourceProvider*, WebKit::WebCompositorSoftwareOutputDevice*);
     virtual ~CCRendererSoftware();
@@ -67,6 +67,8 @@ private:
     SkCanvas* m_skCurrentCanvas;
     SkPaint m_skCurrentPaint;
     OwnPtr<CCResourceProvider::ScopedWriteLockSoftware> m_currentFramebufferLock;
+
+    DISALLOW_COPY_AND_ASSIGN(CCRendererSoftware);
 };
 
 }