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

webkit/tools/test_shell/test_shell_test.cc

Index: webkit/tools/test_shell/test_shell_test.cc
===================================================================
--- webkit/tools/test_shell/test_shell_test.cc	(revision 25715)
+++ webkit/tools/test_shell/test_shell_test.cc	(working copy)
@@ -12,10 +12,11 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "net/base/net_util.h"
 
-std::wstring TestShellTest::GetTestURL(const FilePath& test_case_path,
-                                       const std::string& test_case) {
-  return test_case_path.AppendASCII(test_case).ToWStringHack();
+GURL TestShellTest::GetTestURL(const FilePath& test_case_path,
+                               const std::string& test_case) {
+  return net::FilePathToFileURL(test_case_path.AppendASCII(test_case));
 }
 
 void TestShellTest::SetUp() {
@@ -32,7 +33,7 @@
 
 void TestShellTest::TearDown() {
   // Loading a blank url clears the memory in the current page.
-  test_shell_->LoadURL(L"about:blank");
+  test_shell_->LoadURL(GURL("about:blank"));
   test_shell_->DestroyWindow(test_shell_->mainWnd());
   LayoutTestController::ClearShell();
 
@@ -41,5 +42,5 @@
 }
 
 void TestShellTest::CreateEmptyWindow() {
-  TestShell::CreateNewWindow(L"about:blank", &test_shell_);
+  TestShell::CreateNewWindow(GURL("about:blank"), &test_shell_);
 }