| 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 db6a7b17aae3da4d9a4e0bfb22daa5c4304f3b3c..5a71f92715853a07c5b1d9be440837f82391bdbe 100644
|
| --- a/content/shell/renderer/test_runner/MockColorChooser.h
|
| +++ b/content/shell/renderer/test_runner/MockColorChooser.h
|
| @@ -11,17 +11,17 @@
|
| #include "third_party/WebKit/public/web/WebColorChooser.h"
|
| #include "third_party/WebKit/public/web/WebColorChooserClient.h"
|
|
|
| -namespace content {
|
| -class WebTestProxyBase;
|
| +namespace WebTestRunner {
|
| +class WebTestDelegate;
|
| }
|
|
|
| -namespace WebTestRunner {
|
| +namespace content {
|
|
|
| -class WebTestDelegate;
|
| +class WebTestProxyBase;
|
|
|
| class MockColorChooser : public blink::WebColorChooser {
|
| public:
|
| - MockColorChooser(blink::WebColorChooserClient*, WebTestDelegate*, content::WebTestProxyBase*);
|
| + MockColorChooser(blink::WebColorChooserClient*, WebTestRunner::WebTestDelegate*, content::WebTestProxyBase*);
|
| virtual ~MockColorChooser();
|
|
|
| // blink::WebColorChooser implementation.
|
| @@ -29,17 +29,17 @@ public:
|
| virtual void endChooser() OVERRIDE;
|
|
|
| void invokeDidEndChooser();
|
| - WebTaskList* taskList() { return &m_taskList; }
|
| + WebTestRunner::WebTaskList* taskList() { return &m_taskList; }
|
|
|
| private:
|
| blink::WebColorChooserClient* m_client;
|
| - WebTestDelegate* m_delegate;
|
| + WebTestRunner::WebTestDelegate* m_delegate;
|
| content::WebTestProxyBase* m_proxy;
|
| - WebTaskList m_taskList;
|
| + WebTestRunner::WebTaskList m_taskList;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MockColorChooser);
|
| };
|
|
|
| -}
|
| +} // namespace content
|
|
|
| #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCKCOLORCHOOSER_H_
|
|
|