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

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-2009 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/icu_util.h"
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #endif
 #include "base/md5.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stats_table.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "googleurl/src/url_util.h"
 #include "grit/webkit_strings.h"
 #include "net/base/mime_util.h"
+#include "net/base/net_util.h"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_filter.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebString.h"
@@ skipping 85 matching lines @@
     filter->AddHostnameHandler("test-shell-resource", "inspector",
                                &URLRequestTestShellFileJob::InspectorFactory);
     url_util::AddStandardScheme("test-shell-resource");
 }
 
 TestShell::~TestShell() {
   delegate_->RevokeDragDrop();
 
   // Navigate to an empty page to fire all the destruction logic for the
   // current page.
-  LoadURL(L"about:blank");
+  LoadURL(GURL("about:blank"));
 
   // Call GC twice to clean up garbage.
   CallJSGC();
   CallJSGC();
 
   // Destroy the WebView before the TestWebViewDelegate.
   m_webViewHost.reset();
 
   PlatformCleanUp();
 
   StatsTable *table = StatsTable::current();
   if (dump_stats_table_on_exit_) {
     // Dump the stats table.
     printf("<stats>\n");
     if (table != NULL) {
       int counter_max = table->GetMaxCounters();
       for (int index=0; index < counter_max; index++) {
         std::string name(table->GetRowName(index));
         if (name.length() > 0) {
           int value = table->GetRowValue(index);
           printf("%s:\t%d\n", name.c_str(), value);
         }
       }
     }
     printf("</stats>\n");
   }
 }
 
-bool TestShell::CreateNewWindow(const std::wstring& startingURL,
+bool TestShell::CreateNewWindow(const GURL& starting_url,
                                 TestShell** result) {
   TestShell* shell = new TestShell();
-  bool rv = shell->Initialize(startingURL);
+  bool rv = shell->Initialize(starting_url);
   if (rv) {
     if (result)
       *result = shell;
     TestShell::windowList()->push_back(shell->m_mainWnd);
   }
   return rv;
 }
 
 void TestShell::ShutdownTestShell() {
   PlatformShutdown();
@@ skipping 302 matching lines @@
   webView()->GetMainFrame()->collectGarbage();
 }
 
 WebView* TestShell::CreateWebView(WebView* webview) {
   // If we're running layout tests, only open a new window if the test has
   // called layoutTestController.setCanOpenWindows()
   if (layout_test_mode_ && !layout_test_controller_->CanOpenWindows())
     return NULL;
 
   TestShell* new_win;
-  if (!CreateNewWindow(std::wstring(), &new_win))
+  if (!CreateNewWindow(GURL(), &new_win))
     return NULL;
 
   return new_win->webView();
 }
 
+bool TestShell::IsSVGTestURL(const GURL& url) {
+  return url.is_valid() && url.spec().find("W3C-SVG-1.1") != std::string::npos;
+}
+
 void TestShell::SizeToSVG() {
   SizeTo(kSVGTestWindowWidth, kSVGTestWindowHeight);
 }
 
 void TestShell::SizeToDefault() {
   SizeTo(kTestWindowWidth, kTestWindowHeight);
 }
 
 void TestShell::ResetTestController() {
   layout_test_controller_->Reset();
   event_sending_controller_->Reset();
   delegate_->Reset();
 }
 
-void TestShell::LoadURL(const wchar_t* url) {
-  LoadURLForFrame(url, NULL);
+void TestShell::LoadFile(const FilePath& file) {
+  LoadURLForFrame(net::FilePathToFileURL(file), std::wstring());
+}
+
+void TestShell::LoadURL(const GURL& url) {
+  LoadURLForFrame(url, std::wstring());
 }
 
 bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) {
   // Get the right target frame for the entry.
   WebFrame* frame = webView()->GetMainFrame();
   if (!entry.GetTargetFrame().empty()) {
       frame = webView()->GetFrameWithName(
           WideToUTF16Hack(entry.GetTargetFrame()));
   }
   // TODO(mpcomplete): should we clear the target frame, or should
@@ skipping 148 matching lines @@
 
 void CloseIdleConnections() {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 void SetCacheMode(bool enabled) {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 }  // namespace webkit_glue