test_runner: Move everything else into content namespace.

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 CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
 
 #include <map>
 #include <string>
 
@@ skipping 53 matching lines @@
 struct WebConsoleMessage;
 struct WebContextMenuData;
 struct WebFileChooserParams;
 struct WebPluginParams;
 struct WebPoint;
 struct WebSize;
 struct WebWindowFeatures;
 typedef unsigned WebColor;
 }
 
-namespace WebTestRunner {
+namespace content {
+
 class MockWebSpeechRecognizer;
+class RenderFrame;
+class SpellCheckClient;
 class TestInterfaces;
 class WebTestDelegate;
 class WebTestInterfaces;
 class WebUserMediaClientMock;
-}
-
-namespace content {
-
-class RenderFrame;
-class SpellCheckClient;
 
 class WebTestProxyBase : public blink::WebCompositeAndReadbackAsyncCallback {
 public:
-    void setInterfaces(WebTestRunner::WebTestInterfaces*);
-    void setDelegate(WebTestRunner::WebTestDelegate*);
+    void setInterfaces(WebTestInterfaces*);
+    void setDelegate(WebTestDelegate*);
     void setWidget(blink::WebWidget*);
 
     void reset();
 
     blink::WebSpellCheckClient *spellCheckClient() const;
     blink::WebColorChooser* createColorChooser(blink::WebColorChooserClient*, const blink::WebColor&, const blink::WebVector<blink::WebColorSuggestion>& suggestions);
     bool runFileChooser(const blink::WebFileChooserParams&, blink::WebFileChooserCompletion*);
     void showValidationMessage(const blink::WebRect& anchorInRootView, const blink::WebString& mainText, const blink::WebString& supplementalText, blink::WebTextDirection);
     void hideValidationMessage();
     void moveValidationMessage(const blink::WebRect& anchorInRootView);
@@ skipping 10 matching lines @@
     void didOpenChooser();
     void didCloseChooser();
     bool isChooserShown();
 
     void display(base::Closure callback);
     void displayAsyncThen(base::Closure callback);
 
     void discardBackingStore();
 
     blink::WebMIDIClientMock* midiClientMock();
-    WebTestRunner::MockWebSpeechRecognizer* speechRecognizerMock();
+    MockWebSpeechRecognizer* speechRecognizerMock();
 
-    WebTestRunner::WebTaskList* taskList() { return &m_taskList; }
+    WebTaskList* taskList() { return &m_taskList; }
 
     blink::WebView* webView();
 
     void didForceResize();
 
     void postSpellCheckEvent(const blink::WebString& eventName);
 
     // WebCompositeAndReadbackAsyncCallback implementation.
     virtual void didCompositeAndReadback(const SkBitmap& bitmap);
 
@@ skipping 60 matching lines @@
     void paintRect(const blink::WebRect&);
     void paintInvalidatedRegion();
     void paintPagesWithBoundaries();
     SkCanvas* canvas();
     void invalidateAll();
     void animateNow();
     void DrawSelectionRect(SkCanvas* canvas);
 
     blink::WebWidget* webWidget();
 
-    WebTestRunner::TestInterfaces* m_testInterfaces;
-    ::WebTestRunner::WebTestDelegate* m_delegate;
+    TestInterfaces* m_testInterfaces;
+    WebTestDelegate* m_delegate;
     blink::WebWidget* m_webWidget;
 
-    WebTestRunner::WebTaskList m_taskList;
+    WebTaskList m_taskList;
 
     scoped_ptr<SpellCheckClient> m_spellcheck;
-    scoped_ptr<WebTestRunner::WebUserMediaClientMock> m_userMediaClient;
+    scoped_ptr<WebUserMediaClientMock> m_userMediaClient;
 
     // Painting.
     scoped_ptr<SkCanvas> m_canvas;
     blink::WebRect m_paintRect;
     bool m_isPainting;
     bool m_animateScheduled;
     std::map<unsigned, std::string> m_resourceIdentifierMap;
     std::map<unsigned, blink::WebURLRequest> m_requestMap;
     base::Callback<void(const SkBitmap&)> m_compositeAndReadbackCallback;
 
     bool m_logConsoleOutput;
     int m_chooserCount;
 
     scoped_ptr<blink::WebMIDIClientMock> m_midiClient;
-    scoped_ptr<WebTestRunner::MockWebSpeechRecognizer> m_speechRecognizer;
+    scoped_ptr<MockWebSpeechRecognizer> m_speechRecognizer;
 
 private:
     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:
@@ skipping 134 matching lines @@
         WebTestProxyBase::postSpellCheckEvent(eventName);
     }
 
 private:
     DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_