Move test runner to a component

components/test_runner/web_test_proxy.h

Index: components/test_runner/web_test_proxy.h
diff --git a/content/shell/renderer/test_runner/web_test_proxy.h b/components/test_runner/web_test_proxy.h
similarity index 96%
rename from content/shell/renderer/test_runner/web_test_proxy.h
rename to components/test_runner/web_test_proxy.h
index 8d6bea88e8622d8131f51927dfc076a52ae4e885..0d5c9c26309adc5e8aca6b3377b85d6c33666b8f 100644
--- a/content/shell/renderer/test_runner/web_test_proxy.h
+++ b/components/test_runner/web_test_proxy.h
@@ -2,8 +2,8 @@
 // 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_WEB_TEST_PROXY_H_
-#define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
+#ifndef COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
+#define COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
 
 #include <deque>
 #include <map>
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/shell/renderer/test_runner/web_task.h"
+#include "components/test_runner/web_task.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
@@ -290,6 +290,12 @@ class WebTestProxyBase {
 //    override RenderViewImpl's getter and call a getter from WebTestProxyBase
 //    instead. In addition, WebTestProxyBase will have a public setter that
 //    could be called from the TestRunner.
+#if defined(OS_WIN)
+// WebTestProxy is a diamond-shaped hierarchy, with WebWidgetClient at the root.
+// VS warns when we inherit the WebWidgetClient method implementations from
+// RenderWidget. It's safe to ignore that warning.
+#pragma warning(disable: 4250)
+#endif
 template <class Base, typename T>
 class WebTestProxy : public Base, public WebTestProxyBase {
  public:
@@ -377,8 +383,8 @@ class WebTestProxy : public Base, public WebTestProxyBase {
     base::string16 wrapped_main_text = main_message;
     base::string16 wrapped_sub_text = sub_message;
 
-    Base::SetValidationMessageDirection(
-        &wrapped_main_text, main_message_hint, &wrapped_sub_text, sub_message_hint);
+    Base::SetValidationMessageDirection(&wrapped_main_text, main_message_hint,
+                                        &wrapped_sub_text, sub_message_hint);
 
     WebTestProxyBase::ShowValidationMessage(
         wrapped_main_text, wrapped_sub_text);
@@ -398,4 +404,4 @@ class WebTestProxy : public Base, public WebTestProxyBase {
 
 }  // namespace content
 
-#endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_TEST_PROXY_H_
+#endif  // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_