test_runner: Move WebPermissions into content namespace.

BUG=331299
TEST=None, no functional changes. Just build content_shell,
content_unittests, content_browsertests to make it still link.
TBR=jochen@chromium.org

Review URL: https://codereview.chromium.org/259773007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266505 0039d316-1c4b-4281-b951-d872f2087c98

content/shell/renderer/test_runner/WebPermissions.cpp

@@ -9,9 +9,10 @@
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
+using namespace WebTestRunner;
 using namespace std;
 
-namespace WebTestRunner {
+namespace content {
 
 WebPermissions::WebPermissions()
     : m_delegate(0)
@@ -110,4 +111,4 @@ void WebPermissions::reset()
     m_runningInsecureContentAllowed = false;
 }
 
-}
+}  // namespace content

content/shell/renderer/test_runner/WebPermissions.h

@@ -5,13 +5,15 @@
 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBPERMISSIONS_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBPERMISSIONS_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebPermissionClient.h"
 
 namespace WebTestRunner {
-
 class WebTestDelegate;
+}
+
+namespace content {
 
 class WebPermissions : public blink::WebPermissionClient {
 public:
@@ -37,11 +39,11 @@ public:
     // Resets the policy to allow everything, except for running insecure content.
     void reset();
 
-    void setDelegate(WebTestDelegate*);
+    void setDelegate(WebTestRunner::WebTestDelegate*);
     void setDumpCallbacks(bool);
 
 private:
-    WebTestDelegate* m_delegate;
+    WebTestRunner::WebTestDelegate* m_delegate;
     bool m_dumpCallbacks;
 
     bool m_imagesAllowed;
@@ -54,6 +56,6 @@ private:
     DISALLOW_COPY_AND_ASSIGN(WebPermissions);
 };
 
-}
+}  // namespace content
 
-#endif
+#endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBPERMISSIONS_H_

content/shell/renderer/test_runner/test_runner.h

@@ -30,7 +30,6 @@ class Arguments;
 
 namespace WebTestRunner {
 class TestInterfaces;
-class WebPermissions;
 class WebTestDelegate;
 }
 
@@ -39,6 +38,7 @@ namespace content {
 class InvokeCallbackTask;
 class NotificationPresenter;
 class TestPageOverlay;
+class WebPermissions;
 class WebTestProxyBase;
 
 class TestRunner : public ::WebTestRunner::WebTestRunner,
@@ -698,9 +698,9 @@ class TestRunner : public ::WebTestRunner::WebTestRunner,
   blink::WebFrame* top_loading_frame_;
 
   // WebPermissionClient mock object.
-  scoped_ptr< ::WebTestRunner::WebPermissions> web_permissions_;
+  scoped_ptr<WebPermissions> web_permissions_;
 
-  scoped_ptr<content::NotificationPresenter> notification_presenter_;
+  scoped_ptr<NotificationPresenter> notification_presenter_;
 
   bool pointer_locked_;
   enum {