Replace WebNonCopyable with DISALLOW_COPY_AND_ASSIGN in test runner library

content/shell/renderer/test_runner/WebTestProxy.h

 // Copyright 2013 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 WebTestProxy_h
 #define WebTestProxy_h
 
 #include <map>
 #include <string>
 
+#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/shell/renderer/test_runner/WebTask.h"
-#include "third_party/WebKit/public/platform/WebNonCopyable.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebAXEnums.h"
 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
 #include "third_party/WebKit/public/web/WebIconURL.h"
 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 #include "third_party/WebKit/public/web/WebNavigationType.h"
@@ skipping 199 matching lines @@
     std::map<unsigned, blink::WebURLRequest> m_requestMap;
 
     bool m_logConsoleOutput;
     int m_chooserCount;
 
     scoped_ptr<blink::WebGeolocationClientMock> m_geolocationClient;
     scoped_ptr<blink::WebMIDIClientMock> m_midiClient;
     scoped_ptr<MockWebSpeechRecognizer> m_speechRecognizer;
     scoped_ptr<MockWebSpeechInputController> m_speechInputController;
 
-    // FIXME:: We want to move away from this pattern and mark classes
-    // as Noncopyable, but this class is marked as WEBTESTRUNNER_EXPORT
-    // while WebNonCopyable is not, so we cannot inherit from WebNonCopyable.
-    // To overcome the problem, for now not inheriting from WebNonCopyable
-    // but plan to fix it when we make the change of making WebNonCopyable
-    // a macro rather than class. We will have a single way to mark all classes
-    // as Noncopyable.
-    // Tracked under: http://code.google.com/p/chromium/issues/detail?id=229178
 private:
-    WebTestProxyBase(WebTestProxyBase&);
-    WebTestProxyBase& operator=(const WebTestProxyBase&);
+    DISALLOW_COPY_AND_ASSIGN(WebTestProxyBase);
 };
 
 // Use this template to inject methods into your WebViewClient/WebFrameClient
 // implementation required for the running layout tests.
 template<class Base, typename T>
-class WebTestProxy : public Base, public WebTestProxyBase, public blink::WebNonCopyable {
+class WebTestProxy : public Base, public WebTestProxyBase {
 public:
     explicit WebTestProxy(T t)
         : Base(t)
     {
     }
 
     virtual ~WebTestProxy() { }
 
     // WebViewClient implementation.
     virtual void didInvalidateRect(const blink::WebRect& rect)
@@ skipping 269 matching lines @@
         WebTestProxyBase::hideValidationMessage();
     }
     virtual void moveValidationMessage(const blink::WebRect& anchorInRootView)
     {
         WebTestProxyBase::moveValidationMessage(anchorInRootView);
     }
     virtual void postSpellCheckEvent(const blink::WebString& eventName)
     {
         WebTestProxyBase::postSpellCheckEvent(eventName);
     }
+
+private:
+    DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }
 
 #endif // WebTestProxy_h