Chrome changes to support WebKit API changes.

Also, I removed the GetWebFrame method on WebDataSource since it is not
actually needed.

Removed some dead-code from webframe_impl.cc.

Removed some bogus null-checking of WebCore::Frame::loader().

R=dglazkov

Review URL: http://codereview.chromium.org/67169

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13844 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 9 deletions

diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index 013d46f..40ffdca 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -62,11 +62,12 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
     return NULL;
   }
 
-  virtual uint64_t visitedLinkHash(const char* canonicalURL, size_t length) {
+  virtual unsigned long long visitedLinkHash(const char* canonicalURL,
+                                             size_t length) {
     return 0;
   }
 
-  virtual bool isLinkVisited(uint64_t linkHash) {
+  virtual bool isLinkVisited(unsigned long long linkHash) {
     return false;
   }
 
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 9ba64e0..a27d948 100755
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -76,7 +76,7 @@ std::wstring UrlSuitableForTestResult(const std::wstring& url) {
 // Adds a file called "DRTFakeFile" to |data_object| (CF_HDROP).  Use to fake
 // dragging a file.
 void AddDRTFakeFileToDataObject(WebDragData* drag_data) {
-  drag_data->appendFileName(WebString::fromUTF8("DRTFakeFile"));
+  drag_data->appendToFileNames(WebString::fromUTF8("DRTFakeFile"));
 }
 
 // Get a debugging string from a WebNavigationType.
@@ -273,7 +273,7 @@ void TestWebViewDelegate::DidFailProvisionalLoadWithError(
            GetFrameDescription(frame).c_str());
   }
 
-  LocationChangeDone(frame->GetProvisionalDataSource());
+  LocationChangeDone(frame);
 
   // Don't display an error page if we're running layout tests, because
   // DumpRenderTree doesn't.
@@ -337,7 +337,7 @@ void TestWebViewDelegate::DidFinishLoadForFrame(WebView* webview,
   }
 
   UpdateAddressBar(webview);
-  LocationChangeDone(frame->GetDataSource());
+  LocationChangeDone(frame);
 }
 
 void TestWebViewDelegate::DidFailLoadWithError(WebView* webview,
@@ -348,7 +348,7 @@ void TestWebViewDelegate::DidFailLoadWithError(WebView* webview,
            GetFrameDescription(frame).c_str());
   }
 
-  LocationChangeDone(frame->GetDataSource());
+  LocationChangeDone(frame);
 }
 
 void TestWebViewDelegate::DidFinishDocumentLoadForFrame(WebView* webview,
@@ -783,8 +783,8 @@ void TestWebViewDelegate::UpdateAddressBar(WebView* webView) {
   SetAddressBarURL(dataSource->GetRequest().GetMainDocumentURL());
 }
 
-void TestWebViewDelegate::LocationChangeDone(WebDataSource* data_source) {
-  if (data_source->GetWebFrame() == top_loading_frame_) {
+void TestWebViewDelegate::LocationChangeDone(WebFrame* frame) {
+  if (frame == top_loading_frame_) {
     top_loading_frame_ = NULL;
 
     if (shell_->layout_test_mode())
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 15f92f5..c3d436d 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -288,7 +288,7 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
   // In the Mac code, this is called to trigger the end of a test after the
   // page has finished loading.  From here, we can generate the dump for the
   // test.
-  void LocationChangeDone(WebDataSource* data_source);
+  void LocationChangeDone(WebFrame*);
 
   WebWidgetHost* GetHostForWidget(WebWidget* webwidget);