Remove layoutTestController from test_shell.

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2012 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 118 matching lines @@
 #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) {
     delegate_.reset(new TestWebViewDelegate(this));
     popup_delegate_.reset(new TestWebViewDelegate(this));
-    layout_test_controller_.reset(new LayoutTestController(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");
     webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(
         "TestShell/0.0.0.0"), false);
 }
@@ skipping 246 matching lines @@
 
 void TestShell::TestTimedOut() {
   puts("#TEST_TIMED_OUT\n");
   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_) {
-    layout_test_controller_->BindToJavascript(frame, "layoutTestController");
-    layout_test_controller_->BindToJavascript(frame, "testRunner");
-  }
-}
-
 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(
         navigation_controller_->GetEntryAtIndex(index)->GetURL());
   }
 
@@ skipping 12 matching lines @@
                      "===============================================\n"));
 }
 
 void TestShell::CallJSGC() {
   webView()->mainFrame()->collectGarbage();
 }
 
 WebView* TestShell::CreateWebView() {
   // If we're running layout tests, only open a new window if the test has
   // called layoutTestController.setCanOpenWindows()
-  if (layout_test_mode_ && !layout_test_controller_->CanOpenWindows())
+  if (layout_test_mode_)
     return NULL;
 
   TestShell* new_win;
   if (!CreateNewWindow(GURL(), &new_win))
     return NULL;
 
   return new_win->webView();
 }
 
 void TestShell::ShowDevTools() {
@@ skipping 28 matching lines @@
 
 void TestShell::SizeToSVG() {
   SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight);
 }
 
 void TestShell::SizeToDefault() {
   SizeTo(kTestWindowWidth, kTestWindowHeight);
 }
 
 void TestShell::ResetTestController() {
-  layout_test_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), string16());
 }
 
@@ skipping 110 matching lines @@
   return device_orientation_client_mock_.get();
 }
 
 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
   if (!geolocation_client_mock_.get()) {
     geolocation_client_mock_.reset(
         WebKit::WebGeolocationClientMock::create());
   }
   return geolocation_client_mock_.get();
 }