Hook up WebFrameClient, replacing many WebViewDelegate methods....

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 79 matching lines @@
 }
 
 // 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);
-  shell->LoadURL(UTF8ToWide(url).c_str());
+  shell->LoadURL(GURL(url));
 }
 
 // Callback for Debug > Dump body text... menu item.
 gboolean DumpBodyTextActivated(GtkWidget* widget, TestShell* shell) {
   shell->DumpDocumentText();
   return FALSE;  // Don't stop this message.
 }
 
 // Callback for Debug > Dump render tree... menu item.
 gboolean DumpRenderTreeActivated(GtkWidget* widget, TestShell* shell) {
@@ skipping 195 matching lines @@
 void TestShell::PlatformCleanUp() {
   if (m_mainWnd) {
     // Disconnect our MainWindowDestroyed handler so that we don't go through
     // the shutdown process more than once.
     g_signal_handlers_disconnect_by_func(m_mainWnd,
         reinterpret_cast<gpointer>(MainWindowDestroyed), this);
     gtk_widget_destroy(GTK_WIDGET(m_mainWnd));
   }
 }
 
-bool TestShell::Initialize(const std::wstring& startingURL) {
+bool TestShell::Initialize(const GURL& starting_url) {
   m_mainWnd = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
   gtk_window_set_title(m_mainWnd, "Test Shell");
   // Null out m_mainWnd when it is destroyed so we don't destroy it twice.
   g_signal_connect(G_OBJECT(m_mainWnd), "destroy",
                    G_CALLBACK(gtk_widget_destroyed), &m_mainWnd);
   g_signal_connect(G_OBJECT(m_mainWnd), "destroy",
                    G_CALLBACK(MainWindowDestroyed), this);
   g_signal_connect(G_OBJECT(m_mainWnd), "focus-out-event",
                    G_CALLBACK(MainWindowLostFocus), this);
   g_object_set_data(G_OBJECT(m_mainWnd), "test-shell", this);
@@ skipping 24 matching lines @@
   gtk_toolbar_insert(GTK_TOOLBAR(toolbar), reload, -1 /* append */);
 
   GtkToolItem* stop = gtk_tool_button_new_from_stock(GTK_STOCK_STOP);
   g_signal_connect(G_OBJECT(stop), "clicked",
                    G_CALLBACK(StopButtonClicked), this);
   gtk_toolbar_insert(GTK_TOOLBAR(toolbar), stop, -1 /* append */);
 
   m_editWnd = gtk_entry_new();
   g_signal_connect(G_OBJECT(m_editWnd), "activate",
                    G_CALLBACK(URLEntryActivate), this);
-  gtk_entry_set_text(GTK_ENTRY(m_editWnd), WideToUTF8(startingURL).c_str());
+  gtk_entry_set_text(GTK_ENTRY(m_editWnd), starting_url.spec().c_str());
 
   GtkToolItem* tool_item = gtk_tool_item_new();
   gtk_container_add(GTK_CONTAINER(tool_item), m_editWnd);
   gtk_tool_item_set_expand(tool_item, TRUE);
   gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_item, -1 /* append */);
 
   gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
   m_webViewHost.reset(
       WebViewHost::Create(vbox, delegate_.get(), *TestShell::web_prefs_));
 
   gtk_container_add(GTK_CONTAINER(m_mainWnd), vbox);
   gtk_widget_show_all(GTK_WIDGET(m_mainWnd));
 
   // LoadURL will do a resize, so make sure we don't call LoadURL
   // until we've completed all of our GTK setup.
-  if (!startingURL.empty())
-    LoadURL(startingURL.c_str());
+  if (starting_url.is_valid())
+    LoadURL(starting_url);
 
-  bool bIsSVGTest = startingURL.find(L"W3C-SVG-1.1") != std::wstring::npos;
-  if (bIsSVGTest)
+  if (IsSVGTestURL(starting_url))
     SizeToSVG();
   else
     SizeToDefault();
 
   return true;
 }
 
 void TestShell::TestFinished() {
   if(!test_is_pending_)
     return;
@@ skipping 155 matching lines @@
 
   shell->ResizeSubViews();
 
   if (strstr(params.test_url.c_str(), "loading/") ||
       strstr(params.test_url.c_str(), "loading\\"))
     shell->layout_test_controller()->SetShouldDumpFrameLoadCallbacks(true);
 
   shell->test_is_preparing_ = true;
 
   shell->set_test_params(&params);
-  std::wstring wstr = UTF8ToWide(params.test_url.c_str());
-  shell->LoadURL(wstr.c_str());
+  shell->LoadURL(GURL(params.test_url));
 
   shell->test_is_preparing_ = false;
   shell->WaitTestFinished();
   shell->set_test_params(NULL);
 
   return true;
 }
 
-void TestShell::LoadURLForFrame(const wchar_t* url,
-                                const wchar_t* frame_name) {
-  if (!url)
+void TestShell::LoadURLForFrame(const GURL& url,
+                                const std::wstring& frame_name) {
+  if (!url.is_valid())
     return;
 
-  bool bIsSVGTest = wcsstr(url, L"W3C-SVG-1.1") > 0;
-
-  if (bIsSVGTest)
+  if (IsSVGTestURL(url)) {
     SizeToSVG();
-  else {
+  } else {
     // only resize back to the default when running tests
     if (layout_test_mode())
       SizeToDefault();
   }
 
-  std::wstring frame_string;
-  if (frame_name)
-    frame_string = frame_name;
-
-  std::wstring path(url);
-  GURL gurl;
-  // PathExists will reject any string with no leading '/'
-  // as well as empty strings.
-  if (file_util::AbsolutePath(&path))
-    gurl = net::FilePathToFileURL(FilePath::FromWStringHack(path));
-  else
-    gurl = GURL(WideToUTF8(url));
-
-  navigation_controller_->LoadEntry(new TestNavigationEntry(
-    -1, gurl, std::wstring(), frame_string));
+  navigation_controller_->LoadEntry(
+      new TestNavigationEntry(-1, url, std::wstring(), frame_name));
 }
 
 // TODO(agl): PromptForSaveFile should use FilePath
 bool TestShell::PromptForSaveFile(const wchar_t* prompt_title,
                                   std::wstring* result) {
   GtkWidget* dialog;
   dialog = gtk_file_chooser_dialog_new(WideToUTF8(prompt_title).c_str(),
                                        GTK_WINDOW(m_mainWnd),
                                        GTK_FILE_CHOOSER_ACTION_SAVE,
                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ skipping 79 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