Remove remaining references to test_shell_tests now that the bots have been updated.

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 615 matching lines @@
 
 void TestWebViewDelegate::didCancelClientRedirect(WebFrame* frame) {
 }
 
 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;
-  }
-
   UpdateAddressBar(frame->view());
 }
 
 void TestWebViewDelegate::didReceiveServerRedirectForProvisionalLoad(
     WebFrame* frame) {
   UpdateAddressBar(frame->view());
 }
 
 void TestWebViewDelegate::didFailProvisionalLoad(
     WebFrame* frame, const WebURLError& error) {
-  LocationChangeDone(frame);
-
   // Don't display an error page if we're running layout tests, because
   // DumpRenderTree doesn't.
   if (shell_->layout_test_mode())
     return;
 
   // Don't display an error page if this is simply a cancelled load.  Aside
   // from being dumb, WebCore doesn't expect it and it will cause a crash.
   if (error.reason == net::ERR_ABORTED)
     return;
 
@@ skipping 36 matching lines @@
   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);
   }
 }
 
 void TestWebViewDelegate::didHandleOnloadEvents(WebFrame* frame) {
 }
 
-void TestWebViewDelegate::didFailLoad(
-    WebFrame* frame, const WebURLError& error) {
-  LocationChangeDone(frame);
-}
-
 void TestWebViewDelegate::didFinishLoad(WebFrame* frame) {
   TRACE_EVENT_END_ETW("frame.load", this, frame->document().url().spec());
   UpdateAddressBar(frame->view());
-  LocationChangeDone(frame);
 }
 
 void TestWebViewDelegate::didNavigateWithinPage(
     WebFrame* frame, bool is_new_navigation) {
   frame->dataSource()->setExtraData(pending_extra_data_.release());
 
   UpdateForCommittedLoad(frame, is_new_navigation);
 }
 
 void TestWebViewDelegate::didChangeLocationWithinPage(WebFrame* frame) {
@@ skipping 99 matching lines @@
   return WebKit::Platform::current()->cookieJar();
 }
 
 // Public methods ------------------------------------------------------------
 
 TestWebViewDelegate::TestWebViewDelegate(TestShell* shell)
     : policy_delegate_enabled_(false),
       policy_delegate_is_permissive_(false),
       policy_delegate_should_notify_done_(false),
       shell_(shell),
-      top_loading_frame_(NULL),
       page_id_(-1),
       last_page_id_updated_(-1),
       using_fake_rect_(false),
 #if defined(TOOLKIT_GTK)
       cursor_type_(GDK_X_CURSOR),
 #endif
       block_redirects_(false),
       request_return_null_(false) {
 }
 
@@ skipping 40 matching lines @@
 
   WebDataSource* data_source = main_frame->dataSource();
   if (!data_source)
     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;
-    shell_->TestFinished();
-  }
-}
-
 WebWidgetHost* TestWebViewDelegate::GetWidgetHost() {
   if (this == shell_->delegate())
     return shell_->webViewHost();
   if (this == shell_->popup_delegate())
     return shell_->popupHost();
   return NULL;
 }
 
 void TestWebViewDelegate::UpdateForCommittedLoad(WebFrame* frame,
                                                  bool is_new_navigation) {
@@ skipping 86 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_;
 }