Replace WebNonCopyable with DISALLOW_COPY_AND_ASSIGN in test runner library

content/shell/renderer/test_runner/WebFrameTestProxy.h

Index: content/shell/renderer/test_runner/WebFrameTestProxy.h
diff --git a/content/shell/renderer/test_runner/WebFrameTestProxy.h b/content/shell/renderer/test_runner/WebFrameTestProxy.h
index 400d2bbff31db20e20c20d85252d6a67f51207c5..03f2d7d1d24f2f1a59d2c21ba36ea4d749514a84 100644
--- a/content/shell/renderer/test_runner/WebFrameTestProxy.h
+++ b/content/shell/renderer/test_runner/WebFrameTestProxy.h
@@ -5,15 +5,15 @@
 #ifndef WebFrameTestProxy_h
 #define WebFrameTestProxy_h
 
+#include "base/basictypes.h"
 #include "content/shell/renderer/test_runner/WebTestProxy.h"
-#include "third_party/WebKit/public/platform/WebNonCopyable.h"
 
 namespace WebTestRunner {
 
 // Templetized wrapper around RenderFrameImpl objects, which implement
 // the WebFrameClient interface.
 template<class Base, typename P, typename R>
-class WebFrameTestProxy : public Base, public blink::WebNonCopyable {
+class WebFrameTestProxy : public Base {
 public:
     WebFrameTestProxy(P p, R r)
         : Base(p, r)
@@ -147,6 +147,8 @@ private:
     // It is used instead of a #define and is set by layouttest_support when
     // creating this object.
     int m_version;
+
+    DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
 };
 
 }