Fix fast/loader/reload-policy-delegate.html...

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2006-2008 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 "config.h"
 
@@ skipping 118 matching lines @@
   shell_->BindJSObjectsToWindow(webframe);
 }
 
 WindowOpenDisposition TestWebViewDelegate::DispositionForNavigationAction(
     WebView* webview,
     WebFrame* frame,
     const WebRequest* request,
     WebNavigationType type,
     WindowOpenDisposition disposition,
     bool is_redirect) {
-  if (is_custom_policy_delegate_) {
+  WindowOpenDisposition result;
+  if (policy_delegate_enabled_) {
     std::wstring frame_name = frame->GetName();
+    std::string url_description;
+    if (request->GetURL().SchemeIs("file")) {
+      url_description = request->GetURL().ExtractFileName();
+    } else {
+      url_description = request->GetURL().spec();
+    }
     printf("Policy delegate: attempt to load %s with navigation type '%s'\n",
-           request->GetURL().spec().c_str(), WebNavigationTypeToString(type));
-    return IGNORE_ACTION;
+           url_description.c_str(), WebNavigationTypeToString(type));
+    result = policy_delegate_is_permissive_ ? CURRENT_TAB : IGNORE_ACTION;
+    if (policy_delegate_should_notify_done_)
+      shell_->layout_test_controller()->PolicyDelegateDone();
   } else {
-    return WebViewDelegate::DispositionForNavigationAction(
-      webview, frame, request, type, disposition, is_redirect);
+    result = WebViewDelegate::DispositionForNavigationAction(
+        webview, frame, request, type, disposition, is_redirect);
   }
-}
-
-
-void TestWebViewDelegate::SetCustomPolicyDelegate(bool isCustom) {
-  is_custom_policy_delegate_ = isCustom;
+  return result;
 }
 
 void TestWebViewDelegate::AssignIdentifierToRequest(WebView* webview,
                                                     uint32 identifier,
                                                     const WebRequest& request) {
   if (shell_->ShouldDumpResourceLoadCallbacks()) {
     resource_identifier_map_[identifier] = request.GetURL().possibly_invalid_spec();
   }
 }
 
@@ skipping 577 matching lines @@
 
 void TestWebViewDelegate::RegisterDragDrop() {
 #if defined(OS_WIN)
   // TODO(port): add me once drag and drop works.
   DCHECK(!drop_delegate_);
   drop_delegate_ = new TestDropDelegate(shell_->webViewWnd(),
                                         shell_->webView());
 #endif
 }
 
+void TestWebViewDelegate::SetCustomPolicyDelegate(bool is_custom,
+                                                  bool is_permissive) {
+  policy_delegate_enabled_ = is_custom;
+  policy_delegate_is_permissive_ = is_permissive;
+}
+
+void TestWebViewDelegate::WaitForPolicyDelegate() {
+  policy_delegate_enabled_ = true;
+  policy_delegate_should_notify_done_ = true;
+}
+
 // Private methods -----------------------------------------------------------
 
 void TestWebViewDelegate::UpdateAddressBar(WebView* webView) {
   WebFrame* mainFrame = webView->GetMainFrame();
 
   WebDataSource* dataSource = mainFrame->GetDataSource();
   if (!dataSource)
     dataSource = mainFrame->GetProvisionalDataSource();
   if (!dataSource)
     return;
@@ skipping 103 matching lines @@
   }
 }
 
 WebWorker* TestWebViewDelegate::CreateWebWorker(WebWorkerClient* client) {
 #if ENABLE(WORKERS)
   return TestWebWorkerHelper::CreateWebWorker(client);
 #else
   return NULL;
 #endif
 }