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

cc/CCProxy.h

 // Copyright 2011 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 CCProxy_h
 #define CCProxy_h
 
+#include "base/basictypes.h"
 #include "IntRect.h"
 #include <public/WebCompositorOutputSurface.h>
-#include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 
 namespace cc {
 
 class CCThread;
 struct CCRenderingStats;
 struct RendererCapabilities;
 
 // Abstract class responsible for proxying commands from the main-thread side of
 // the compositor over to the compositor implementation.
 class CCProxy {
-    WTF_MAKE_NONCOPYABLE(CCProxy);
 public:
     static void setMainThread(CCThread*);
     static CCThread* mainThread();
 
     static bool hasImplThread();
     static void setImplThread(CCThread*);
     static CCThread* implThread();
 
     // Returns 0 if the current thread is neither the main thread nor the impl thread.
     static CCThread* currentThread();
@@ skipping 60 matching lines @@
     virtual void loseContext() = 0;
 
 #ifndef NDEBUG
     static void setCurrentThreadIsImplThread(bool);
 #endif
 
 protected:
     CCProxy();
     friend class DebugScopedSetImplThread;
     friend class DebugScopedSetMainThreadBlocked;
+
+private:
+    DISALLOW_COPY_AND_ASSIGN(CCProxy);
 };
 
 class DebugScopedSetMainThreadBlocked {
 public:
     DebugScopedSetMainThreadBlocked()
     {
 #if !ASSERT_DISABLED
         ASSERT(!CCProxy::isMainThreadBlocked());
         CCProxy::setMainThreadBlocked(true);
 #endif
     }
     ~DebugScopedSetMainThreadBlocked()
     {
 #if !ASSERT_DISABLED
         ASSERT(CCProxy::isMainThreadBlocked());
         CCProxy::setMainThreadBlocked(false);
 #endif
     }
 };
 
 }
 
 #endif