Change decidePolicyForNavigation() to takea WebDataSource::ExtraData

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2012 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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 539 matching lines @@
 void TestWebViewDelegate::loadURLExternally(
     WebFrame* frame, const WebURLRequest& request,
     WebNavigationPolicy policy) {
   DCHECK_NE(policy, WebKit::WebNavigationPolicyCurrentTab);
   TestShell* shell = NULL;
   if (TestShell::CreateNewWindow(request.url(), &shell))
     shell->Show(policy);
 }
 
 WebNavigationPolicy TestWebViewDelegate::decidePolicyForNavigation(
-    WebFrame* frame, WebDataSource* dataSource, const WebURLRequest& request,
-    WebNavigationType type, WebNavigationPolicy default_policy,
-    bool is_redirect) {
+    WebFrame* frame, WebDataSource::ExtraData* extraData,
+    const WebURLRequest& request, WebNavigationType type,
+    WebNavigationPolicy default_policy, bool is_redirect) {
   WebNavigationPolicy result;
   if (policy_delegate_enabled_) {
     printf("Policy delegate: attempt to load %s with navigation type '%s'\n",
            GetURLDescription(request.url()).c_str(),
            WebNavigationTypeToString(type));
     if (policy_delegate_is_permissive_) {
       result = WebKit::WebNavigationPolicyCurrentTab;
     } else {
       result = WebKit::WebNavigationPolicyIgnore;
     }
@@ skipping 428 matching lines @@
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }