Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1880)

Unified Diff: content/shell/renderer/test_runner/MockColorChooser.h

Issue 123243002: Replace WebNonCopyable with DISALLOW_COPY_AND_ASSIGN in test runner library (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/renderer/test_runner/MockColorChooser.h
diff --git a/content/shell/renderer/test_runner/MockColorChooser.h b/content/shell/renderer/test_runner/MockColorChooser.h
index 56411149cd888c5ff4e1e12498391f3b96a5f169..521ed11a6337a5d3f5092c3deede383de8a38d6c 100644
--- a/content/shell/renderer/test_runner/MockColorChooser.h
+++ b/content/shell/renderer/test_runner/MockColorChooser.h
@@ -5,9 +5,9 @@
#ifndef MockColorChooser_h
#define MockColorChooser_h
+#include "base/basictypes.h"
#include "content/shell/renderer/test_runner/TestCommon.h"
#include "content/shell/renderer/test_runner/WebTask.h"
-#include "third_party/WebKit/public/platform/WebNonCopyable.h"
#include "third_party/WebKit/public/web/WebColorChooser.h"
#include "third_party/WebKit/public/web/WebColorChooserClient.h"
@@ -15,7 +15,7 @@ namespace WebTestRunner {
class WebTestDelegate;
class WebTestProxyBase;
-class MockColorChooser : public blink::WebColorChooser, public blink::WebNonCopyable {
+class MockColorChooser : public blink::WebColorChooser {
public:
MockColorChooser(blink::WebColorChooserClient*, WebTestDelegate*, WebTestProxyBase*);
virtual ~MockColorChooser();
@@ -31,6 +31,8 @@ private:
WebTestDelegate* m_delegate;
WebTestProxyBase* m_proxy;
WebTaskList m_taskList;
+
+ DISALLOW_COPY_AND_ASSIGN(MockColorChooser);
};
}
« no previous file with comments | « content/shell/renderer/test_runner/CppBoundClass.h ('k') | content/shell/renderer/test_runner/MockSpellCheck.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698