Move TestRunner from CppVariable to gin::Wrappable

content/shell/renderer/test_runner/TestInterfaces.cpp

 // 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.
 
 #include "content/shell/renderer/test_runner/TestInterfaces.h"
 
 #include <string>
 
 #include "base/strings/stringprintf.h"
 #include "content/shell/renderer/test_runner/EventSender.h"
-#include "content/shell/renderer/test_runner/TestRunner.h"
 #include "content/shell/renderer/test_runner/WebTestProxy.h"
 #include "content/shell/renderer/test_runner/accessibility_controller.h"
 #include "content/shell/renderer/test_runner/gamepad_controller.h"
 #include "content/shell/renderer/test_runner/text_input_controller.h"
+#include "content/shell/renderer/test_runner/test_runner.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using namespace blink;
 using namespace std;
 
 namespace WebTestRunner {
 
 TestInterfaces::TestInterfaces()
     : m_accessibilityController(new content::AccessibilityController())
     , m_eventSender(new EventSender(this))
     , m_gamepadController(new content::GamepadController())
     , m_textInputController(new content::TextInputController())
-    , m_testRunner(new TestRunner(this))
+    , m_testRunner(new content::TestRunner(this))
     , m_delegate(0)
 {
     blink::setLayoutTestMode(true);
 
     // NOTE: please don't put feature specific enable flags here,
     // instead add them to RuntimeEnabledFeatures.in
 
     resetAll();
 }
 
 TestInterfaces::~TestInterfaces()
 {
     m_accessibilityController->SetWebView(0);
     m_eventSender->setWebView(0);
     // m_gamepadController doesn't depend on WebView.
     m_textInputController->SetWebView(NULL);
-    m_testRunner->setWebView(0, 0);
+    m_testRunner->SetWebView(0, 0);
 
     m_accessibilityController->SetDelegate(0);
     m_eventSender->setDelegate(0);
     m_gamepadController->SetDelegate(0);
     // m_textInputController doesn't depend on WebTestDelegate.
-    m_testRunner->setDelegate(0);
+    m_testRunner->SetDelegate(0);
 }
 
 void TestInterfaces::setWebView(WebView* webView, WebTestProxyBase* proxy)
 {
     m_proxy = proxy;
     m_accessibilityController->SetWebView(webView);
     m_eventSender->setWebView(webView);
     // m_gamepadController doesn't depend on WebView.
     m_textInputController->SetWebView(webView);
-    m_testRunner->setWebView(webView, proxy);
+    m_testRunner->SetWebView(webView, proxy);
 }
 
 void TestInterfaces::setDelegate(WebTestDelegate* delegate)
 {
     m_accessibilityController->SetDelegate(delegate);
     m_eventSender->setDelegate(delegate);
     m_gamepadController->SetDelegate(delegate);
     // m_textInputController doesn't depend on WebTestDelegate.
-    m_testRunner->setDelegate(delegate);
+    m_testRunner->SetDelegate(delegate);
     m_delegate = delegate;
 }
 
 void TestInterfaces::bindTo(WebFrame* frame)
 {
     m_accessibilityController->Install(frame);
     m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender"));
     m_gamepadController->Install(frame);
     m_textInputController->Install(frame);
-    m_testRunner->bindToJavascript(frame, WebString::fromUTF8("testRunner"));
-    m_testRunner->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));
+    m_testRunner->Install(frame);
 }
 
 void TestInterfaces::resetTestHelperControllers()
 {
     m_accessibilityController->Reset();
     m_eventSender->reset();
     m_gamepadController->Reset();
     // m_textInputController doesn't have any state to reset.
     WebCache::clear();
 }
 
 void TestInterfaces::resetAll()
 {
     resetTestHelperControllers();
-    m_testRunner->reset();
+    m_testRunner->Reset();
 }
 
 void TestInterfaces::setTestIsRunning(bool running)
 {
-    m_testRunner->setTestIsRunning(running);
+    m_testRunner->SetTestIsRunning(running);
 }
 
 void TestInterfaces::configureForTestWithURL(const WebURL& testURL, bool generatePixels)
 {
     string spec = GURL(testURL).spec();
     m_testRunner->setShouldGeneratePixelResults(generatePixels);
     if (spec.find("loading/") != string::npos)
         m_testRunner->setShouldDumpFrameLoadCallbacks(true);
     if (spec.find("/dumpAsText/") != string::npos) {
         m_testRunner->setShouldDumpAsText(true);
@@ skipping 39 matching lines @@
 content::AccessibilityController* TestInterfaces::accessibilityController()
 {
     return m_accessibilityController.get();
 }
 
 EventSender* TestInterfaces::eventSender()
 {
     return m_eventSender.get();
 }
 
-TestRunner* TestInterfaces::testRunner()
+content::TestRunner* TestInterfaces::testRunner()
 {
     return m_testRunner.get();
 }
 
 WebTestDelegate* TestInterfaces::delegate()
 {
     return m_delegate;
 }
 
 WebTestProxyBase* TestInterfaces::proxy()
 {
     return m_proxy;
 }
 
 const vector<WebTestProxyBase*>& TestInterfaces::windowList()
 {
     return m_windowList;
 }
 
 WebThemeEngine* TestInterfaces::themeEngine()
 {
-    if (!m_testRunner->useMockTheme())
+    if (!m_testRunner->UseMockTheme())
         return 0;
 #if defined(__APPLE__)
     if (!m_themeEngine.get())
         m_themeEngine.reset(new WebTestThemeEngineMac());
 #else
     if (!m_themeEngine.get())
         m_themeEngine.reset(new WebTestThemeEngineMock());
 #endif
     return m_themeEngine.get();
 }
 
 }