Reverting 27711.

webkit/tools/test_shell/test_shell_gtk.cc

 // Copyright (c) 2006-2008 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.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 70 matching lines @@
   shell->GoBackOrForward(-1);
 }
 
 // Callback for when you click the forward button.
 void ForwardButtonClicked(GtkButton* button, TestShell* shell) {
   shell->GoBackOrForward(1);
 }
 
 // Callback for when you click the stop button.
 void StopButtonClicked(GtkButton* button, TestShell* shell) {
-  shell->webView()->StopLoading();
+  shell->webView()->mainFrame()->stopLoading();
 }
 
 // Callback for when you click the reload button.
 void ReloadButtonClicked(GtkButton* button, TestShell* shell) {
   shell->Reload();
 }
 
 // Callback for when you press enter in the URL box.
 void URLEntryActivate(GtkEntry* entry, TestShell* shell) {
   const gchar* url = gtk_entry_get_text(entry);
@@ skipping 425 matching lines @@
   // ResetTestController may have closed the window we were holding on to.
   // Grab the first window again.
   window = *(TestShell::windowList()->begin());
   shell = static_cast<TestShell*>(g_object_get_data(G_OBJECT(window), "test-shell"));
   DCHECK(shell);
 
   // Clear focus between tests.
   shell->m_focusedWidgetHost = NULL;
 
   // Make sure the previous load is stopped.
-  shell->webView()->StopLoading();
+  shell->webView()->mainFrame()->stopLoading();
   shell->navigation_controller()->Reset();
 
   // Clean up state between test runs.
   webkit_glue::ResetBeforeTestRun(shell->webView());
   ResetWebPreferences();
   web_prefs_->Apply(shell->webView());
 
   // TODO(agl): Maybe make the window hidden in the future. Window does this
   // by positioning it off the screen but the GTK function to do this is
   // deprecated and appears to have been removed.
@@ skipping 123 matching lines @@
       break;
   }
   return TestShell::NetResourceProvider(resource_id);
 }
 
 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
 }
 
 }  // namespace webkit_glue