| Index: public/testing/WebTestProxy.h
|
| diff --git a/public/testing/WebTestProxy.h b/public/testing/WebTestProxy.h
|
| index ba1de2e67d0aadbbd92b105e38155c2ce963e476..49f00189d2bdb0fa948088ed57688acdad40d743 100644
|
| --- a/public/testing/WebTestProxy.h
|
| +++ b/public/testing/WebTestProxy.h
|
| @@ -33,6 +33,7 @@
|
|
|
| #include "WebTask.h"
|
| #include "WebTestCommon.h"
|
| +#include "public/platform/WebNonCopyable.h"
|
| #include "public/platform/WebRect.h"
|
| #include "public/platform/WebURLError.h"
|
| #include "public/platform/WebURLRequest.h"
|
| @@ -262,6 +263,14 @@ private:
|
| std::auto_ptr<MockWebSpeechInputController> m_speechInputController;
|
| std::auto_ptr<MockWebValidationMessageClient> m_validationMessageClient;
|
|
|
| + // 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&);
|
| @@ -270,7 +279,7 @@ private:
|
| // 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 {
|
| +class WebTestProxy : public Base, public WebTestProxyBase, public WebKit::WebNonCopyable {
|
| public:
|
| explicit WebTestProxy(T t)
|
| : Base(t)
|
|
|