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

webkit/tools/test_shell/test_shell.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 129 matching lines @@
              layout_test_controller_->ShouldDumpResourceLoadCallbacks();
     }
     bool ShouldDumpTitleChanges() {
       return layout_test_mode_ &&
              layout_test_controller_->ShouldDumpTitleChanges();
     }
     bool AcceptsEditing() {
       return layout_test_controller_->AcceptsEditing();
     }
 
-    void LoadURL(const wchar_t* url);
-    void LoadURLForFrame(const wchar_t* url, const wchar_t* frame_name);
+    void LoadFile(const FilePath& file);
+    void LoadURL(const GURL& url);
+    void LoadURLForFrame(const GURL& url, const std::wstring& frame_name);
     void GoBackOrForward(int offset);
     void Reload();
     bool Navigate(const TestNavigationEntry& entry, bool reload);
 
     bool PromptForSaveFile(const wchar_t* prompt_title, std::wstring* result);
     std::wstring GetDocumentText();
     void DumpDocumentText();
     void DumpRenderTree();
 
     gfx::NativeWindow mainWnd() const { return m_mainWnd; }
     gfx::NativeView webViewWnd() const { return m_webViewHost->view_handle(); }
     gfx::NativeEditView editWnd() const { return m_editWnd; }
     gfx::NativeView popupWnd() const { return m_popupHost->view_handle(); }
 
     static WindowList* windowList() { return window_list_; }
 
     // If shell is non-null, then *shell is assigned upon successful return
-    static bool CreateNewWindow(const std::wstring& startingURL,
+    static bool CreateNewWindow(const GURL& starting_url,
                                 TestShell** shell = NULL);
 
     static void DestroyWindow(gfx::NativeWindow windowHandle);
 
     // Remove the given window from window_list_, return true if it was in the
     // list and was removed and false otherwise.
     static bool RemoveWindowFromList(gfx::NativeWindow window);
 
     // Implements CreateWebView for TestWebViewDelegate, which in turn
     // is called as a WebViewDelegate.
@@ skipping 83 matching lines @@
     static void DestroyAssociatedShell(gfx::NativeWindow handle);
 #endif
 
     // Show the "attach to me" dialog, for debugging test shell startup.
     static void ShowStartupDebuggingDialog();
 
     // This is called indirectly by the network layer to access resources.
     static StringPiece NetResourceProvider(int key);
 
 protected:
-    bool Initialize(const std::wstring& startingURL);
+    bool Initialize(const GURL& starting_url);
+    bool IsSVGTestURL(const GURL& url);
     void SizeToSVG();
     void SizeToDefault();
     void SizeTo(int width, int height);
     void ResizeSubViews();
 
     // Set the focus in interactive mode (pass through to relevant system call).
     void InteractiveSetFocus(WebWidgetHost* host, bool enable);
 
 #if defined(OS_WIN)
     static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
@@ skipping 60 matching lines @@
 #if defined(OS_WIN)
     // Used by the watchdog to know when it's finished.
     HANDLE finished_event_;
 #endif
 
     // Dump the stats table counters on exit.
     bool dump_stats_table_on_exit_;
 };
 
 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_