Remove eventSender, accessibilityController, plainText and

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2011 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
-#include "webkit/tools/test_shell/accessibility_controller.h"
 #include "webkit/tools/test_shell/notification_presenter.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_devtools_agent.h"
 #include "webkit/tools/test_shell/test_shell_devtools_client.h"
 #include "webkit/tools/test_shell/test_shell_request_context.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 using WebKit::WebCanvas;
@@ skipping 68 matching lines @@
 #if defined(OS_WIN)
       default_edit_wnd_proc_(0),
 #endif
       test_params_(NULL),
       is_modal_(false),
       is_loading_(false),
       allow_images_(true),
       allow_plugins_(true),
       allow_scripts_(true),
       dump_stats_table_on_exit_(false) {
-    accessibility_controller_.reset(new AccessibilityController(this));
     delegate_.reset(new TestWebViewDelegate(this));
     popup_delegate_.reset(new TestWebViewDelegate(this));
     layout_test_controller_.reset(new LayoutTestController(this));
-    event_sending_controller_.reset(new EventSendingController(this));
-    plain_text_controller_.reset(new PlainTextController(this));
-    text_input_controller_.reset(new TextInputController(this));
     navigation_controller_.reset(new TestNavigationController(this));
     notification_presenter_.reset(new TestNotificationPresenter(this));
 
     net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
     filter->AddHostnameHandler("test-shell-resource", "inspector",
                                &URLRequestTestShellFileJob::InspectorFactory);
     url_util::AddStandardScheme("test-shell-resource");
 }
 
 TestShell::~TestShell() {
@@ skipping 390 matching lines @@
   TestFinished();
 }
 
 void TestShell::Show(WebNavigationPolicy policy) {
   delegate_->show(policy);
 }
 
 void TestShell::BindJSObjectsToWindow(WebFrame* frame) {
   // Only bind the test classes if we're running tests.
   if (layout_test_mode_) {
-    accessibility_controller_->BindToJavascript(
-        frame, "accessibilityController");
     layout_test_controller_->BindToJavascript(frame, "layoutTestController");
-    event_sending_controller_->BindToJavascript(frame, "eventSender");
-    plain_text_controller_->BindToJavascript(frame, "plainText");
-    text_input_controller_->BindToJavascript(frame, "textInputController");
   }
 }
 
 void TestShell::DumpBackForwardEntry(int index, string16* result) {
   int current_index = navigation_controller_->GetLastCommittedEntryIndex();
 
   std::string content_state =
       navigation_controller_->GetEntryAtIndex(index)->GetContentState();
   if (content_state.empty()) {
     content_state = webkit_glue::CreateHistoryStateForURL(
@@ skipping 64 matching lines @@
 
 void TestShell::SizeToSVG() {
   SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight);
 }
 
 void TestShell::SizeToDefault() {
   SizeTo(kTestWindowWidth, kTestWindowHeight);
 }
 
 void TestShell::ResetTestController() {
-  accessibility_controller_->Reset();
   layout_test_controller_->Reset();
-  event_sending_controller_->Reset();
   notification_presenter_->Reset();
   delegate_->Reset();
   if (geolocation_client_mock_.get())
     geolocation_client_mock_->resetMock();
 }
 
 void TestShell::LoadFile(const FilePath& file) {
   LoadURLForFrame(net::FilePathToFileURL(file), std::wstring());
 }
 
@@ skipping 247 matching lines @@
     for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
       if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
         webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path);
         plugins->erase(plugins->begin() + i);
       }
     }
   }
 }
 
 }  // namespace webkit_glue