Remove layoutTestController from test_shell.

webkit/tools/test_shell/test_webview_delegate.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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 680 matching lines @@
     if (!originating_node.isNull()) {
       printf(" originating from %s",
           GetNodeDescription(originating_node, 0).c_str());
     }
     printf("\n");
     if (policy_delegate_is_permissive_) {
       result = WebKit::WebNavigationPolicyCurrentTab;
     } else {
       result = WebKit::WebNavigationPolicyIgnore;
     }
-    if (policy_delegate_should_notify_done_)
-      shell_->layout_test_controller()->PolicyDelegateDone();
   } else {
     result = default_policy;
   }
   return result;
 }
 
 bool TestWebViewDelegate::canHandleRequest(
     WebFrame* frame, const WebURLRequest& request) {
   GURL url = request.url();
   // Just reject the scheme used in
@@ skipping 40 matching lines @@
 void TestWebViewDelegate::didCreateDataSource(
     WebFrame* frame, WebDataSource* ds) {
   ds->setExtraData(pending_extra_data_.release());
 }
 
 void TestWebViewDelegate::didStartProvisionalLoad(WebFrame* frame) {
   if (!top_loading_frame_) {
     top_loading_frame_ = frame;
   }
 
-  if (shell_->layout_test_controller()->StopProvisionalFrameLoads()) {
-    printf("%s - stopping load in didStartProvisionalLoadForFrame callback\n",
-           UTF16ToUTF8(GetFrameDescription(frame)).c_str());
-    frame->stopLoading();
-  }
   UpdateAddressBar(frame->view());
 }
 
 void TestWebViewDelegate::didReceiveServerRedirectForProvisionalLoad(
     WebFrame* frame) {
   UpdateAddressBar(frame->view());
 }
 
 void TestWebViewDelegate::didFailProvisionalLoad(
     WebFrame* frame, const WebURLError& error) {
@@ skipping 32 matching lines @@
   // In case the load failed before DidCreateDataSource was called.
   if (replace)
     set_pending_extra_data(NULL);
 }
 
 void TestWebViewDelegate::didCommitProvisionalLoad(
     WebFrame* frame, bool is_new_navigation) {
   UpdateForCommittedLoad(frame, is_new_navigation);
 }
 
-void TestWebViewDelegate::didClearWindowObject(WebFrame* frame) {
-  shell_->BindJSObjectsToWindow(frame);
-}
-
 void TestWebViewDelegate::didReceiveTitle(
     WebFrame* frame, const WebString& title, WebTextDirection direction) {
   SetPageTitle(title);
 }
 
 void TestWebViewDelegate::didFinishDocumentLoad(WebFrame* frame) {
   unsigned pending_unload_events = frame->unloadListenerCount();
   if (pending_unload_events) {
     printf("%s - has %u onunload handler(s)\n",
         UTF16ToUTF8(GetFrameDescription(frame)).c_str(), pending_unload_events);
@@ skipping 206 matching lines @@
     data_source = main_frame->provisionalDataSource();
   if (!data_source)
     return;
 
   SetAddressBarURL(data_source->request().url());
 }
 
 void TestWebViewDelegate::LocationChangeDone(WebFrame* frame) {
   if (frame == top_loading_frame_) {
     top_loading_frame_ = NULL;
-
-    if (shell_->layout_test_mode())
-      shell_->layout_test_controller()->LocationChangeDone();
+    shell_->TestFinished();
   }
 }
 
 WebWidgetHost* TestWebViewDelegate::GetWidgetHost() {
   if (this == shell_->delegate())
     return shell_->webViewHost();
   if (this == shell_->popup_delegate())
     return shell_->popupHost();
   return NULL;
 }
@@ skipping 89 matching lines @@
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }