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

webkit/tools/test_shell/test_shell_mac.mm

 // 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 <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 #import <objc/objc-runtime.h>
 #include <sys/stat.h>
 
 #include "webkit/tools/test_shell/test_shell.h"
@@ skipping 207 matching lines @@
 NSButton* MakeTestButton(NSRect* rect, NSString* title, NSView* parent) {
   NSButton* button = [[[NSButton alloc] initWithFrame:*rect] autorelease];
   [button setTitle:title];
   [button setBezelStyle:NSSmallSquareBezelStyle];
   [button setAutoresizingMask:(NSViewMaxXMargin | NSViewMinYMargin)];
   [parent addSubview:button];
   rect->origin.x += BUTTON_WIDTH;
   return button;
 }
 
-bool TestShell::Initialize(const std::wstring& startingURL) {
+bool TestShell::Initialize(const GURL& starting_url) {
   // Perform application initialization:
   // send message to app controller?  need to work this out
 
   // TODO(awalker): this is a straight recreation of windows test_shell.cc's
   // window creation code--we should really pull this from the nib and grab
   // references to the already-created subviews that way.
   NSRect screen_rect = [[NSScreen mainScreen] visibleFrame];
   NSRect window_rect = { {0, screen_rect.size.height - kTestWindowHeight},
                          {kTestWindowWidth, kTestWindowHeight} };
   m_mainWnd = [[NSWindow alloc]
@@ skipping 67 matching lines @@
   [m_editWnd setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
   [m_editWnd setTarget:web_view];
   [m_editWnd setAction:@selector(takeURLStringValueFrom:)];
   [[m_editWnd cell] setWraps:NO];
   [[m_editWnd cell] setScrollable:YES];
 
   // show the window
   [m_mainWnd makeKeyAndOrderFront: nil];
 
   // Load our initial content.
-  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)) {
     SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight);
   } else {
     SizeToDefault();
   }
 
   return true;
 }
 
 void TestShell::TestFinished() {
   if (!test_is_pending_)
@@ skipping 197 matching lines @@
   // offscreen.
   [shell->m_mainWnd orderOut:nil];
   shell->ResizeSubViews();
 
   if (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;
 
-  std::string url8 = WideToUTF8(url);
-
-  bool bIsSVGTest = strstr(url8.c_str(), "W3C-SVG-1.1") > 0;
-
-  if (bIsSVGTest) {
+  if (IsSVGTestURL(url)) {
     SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight);
   } else {
     // only resize back to the default when running tests
     if (layout_test_mode())
       SizeToDefault();
   }
 
-  std::string urlString(url8);
-  struct stat stat_buf;
-  if (!urlString.empty() && stat(url8.c_str(), &stat_buf) == 0) {
-    urlString.insert(0, "file://");
-  }
-
-  std::wstring frame_string;
-  if (frame_name)
-    frame_string = frame_name;
-
-  navigation_controller_->LoadEntry(new TestNavigationEntry(
-      -1, GURL(urlString), std::wstring(), frame_string));
+  navigation_controller_->LoadEntry(
+      new TestNavigationEntry(-1, url, std::wstring(), frame_name));
 }
 
 bool TestShell::PromptForSaveFile(const wchar_t* prompt_title,
                                   std::wstring* result)
 {
   NSSavePanel* save_panel = [NSSavePanel savePanel];
 
   /* set up new attributes */
   [save_panel setRequiredFileType:@"txt"];
   [save_panel setMessage:
@@ skipping 119 matching lines @@
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue