| Index: content/shell/renderer/test_runner/TestInterfaces.cpp
|
| diff --git a/content/shell/renderer/test_runner/TestInterfaces.cpp b/content/shell/renderer/test_runner/TestInterfaces.cpp
|
| index 919c1170d0164a4dd53f4c2621523d0d533c497a..626ed54877d11a1a6e76fff02bb7551dba91afc7 100644
|
| --- a/content/shell/renderer/test_runner/TestInterfaces.cpp
|
| +++ b/content/shell/renderer/test_runner/TestInterfaces.cpp
|
| @@ -9,9 +9,9 @@
|
| #include "content/shell/renderer/test_runner/AccessibilityController.h"
|
| #include "content/shell/renderer/test_runner/EventSender.h"
|
| #include "content/shell/renderer/test_runner/TestRunner.h"
|
| -#include "content/shell/renderer/test_runner/TextInputController.h"
|
| #include "content/shell/renderer/test_runner/WebTestProxy.h"
|
| #include "content/shell/renderer/test_runner/gamepad_controller.h"
|
| +#include "content/shell/renderer/test_runner/text_input_controller.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"
|
| @@ -28,7 +28,7 @@ TestInterfaces::TestInterfaces()
|
| : m_accessibilityController(new AccessibilityController())
|
| , m_eventSender(new EventSender(this))
|
| , m_gamepadController(new content::GamepadController())
|
| - , m_textInputController(new TextInputController())
|
| + , m_textInputController(new content::TextInputController())
|
| , m_testRunner(new TestRunner(this))
|
| , m_delegate(0)
|
| {
|
| @@ -45,13 +45,11 @@ TestInterfaces::~TestInterfaces()
|
| m_accessibilityController->setWebView(0);
|
| m_eventSender->setWebView(0);
|
| // m_gamepadController doesn't depend on WebView.
|
| - m_textInputController->setWebView(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);
|
| }
|
|
|
| @@ -61,7 +59,6 @@ void TestInterfaces::setWebView(WebView* webView, WebTestProxyBase* 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);
|
| }
|
|
|
| @@ -70,7 +67,6 @@ 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_delegate = delegate;
|
| }
|
| @@ -80,7 +76,7 @@ void TestInterfaces::bindTo(WebFrame* frame)
|
| m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController"));
|
| m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender"));
|
| m_gamepadController->Install(frame);
|
| - m_textInputController->bindToJavascript(frame, WebString::fromUTF8("textInputController"));
|
| + m_textInputController->Install(frame);
|
| m_testRunner->bindToJavascript(frame, WebString::fromUTF8("testRunner"));
|
| m_testRunner->bindToJavascript(frame, WebString::fromUTF8("layoutTestController"));
|
| }
|
| @@ -90,7 +86,6 @@ void TestInterfaces::resetTestHelperControllers()
|
| m_accessibilityController->reset();
|
| m_eventSender->reset();
|
| m_gamepadController->Reset();
|
| - // m_textInputController doesn't have any state to reset.
|
| WebCache::clear();
|
| }
|
|
|
|
|