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

webkit/tools/test_shell/layout_test_controller.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 definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
@@ skipping 95 matching lines @@
   BindMethod("execCommand", &LayoutTestController::execCommand);
   BindMethod("isCommandEnabled", &LayoutTestController::isCommandEnabled);
   BindMethod("setPopupBlockingEnabled", &LayoutTestController::setPopupBlockingEnabled);
   BindMethod("setStopProvisionalFrameLoads", &LayoutTestController::setStopProvisionalFrameLoads);
   BindMethod("setSmartInsertDeleteEnabled", &LayoutTestController::setSmartInsertDeleteEnabled);
   BindMethod("setSelectTrailingWhitespaceEnabled", &LayoutTestController::setSelectTrailingWhitespaceEnabled);
   BindMethod("pauseAnimationAtTimeOnElementWithId", &LayoutTestController::pauseAnimationAtTimeOnElementWithId);
   BindMethod("pauseTransitionAtTimeOnElementWithId", &LayoutTestController::pauseTransitionAtTimeOnElementWithId);
   BindMethod("elementDoesAutoCompleteForElementWithId", &LayoutTestController::elementDoesAutoCompleteForElementWithId);
   BindMethod("numberOfActiveAnimations", &LayoutTestController::numberOfActiveAnimations);
+  BindMethod("setCustomPolicyDelegate", &LayoutTestController::setCustomPolicyDelegate);
+  BindMethod("waitForPolicyDelegate", &LayoutTestController::waitForPolicyDelegate);
 
   // The following are stubs.
   BindMethod("dumpAsWebArchive", &LayoutTestController::dumpAsWebArchive);
   BindMethod("setMainFrameIsFirstResponder", &LayoutTestController::setMainFrameIsFirstResponder);
   BindMethod("dumpSelectionRect", &LayoutTestController::dumpSelectionRect);
   BindMethod("display", &LayoutTestController::display);
   BindMethod("testRepaint", &LayoutTestController::testRepaint);
   BindMethod("repaintSweepHorizontally", &LayoutTestController::repaintSweepHorizontally);
   BindMethod("clearBackForwardList", &LayoutTestController::clearBackForwardList);
   BindMethod("keepWebHistory", &LayoutTestController::keepWebHistory);
   BindMethod("storeWebScriptObject", &LayoutTestController::storeWebScriptObject);
   BindMethod("accessStoredWebScriptObject", &LayoutTestController::accessStoredWebScriptObject);
   BindMethod("objCClassNameOf", &LayoutTestController::objCClassNameOf);
   BindMethod("addDisallowedURL", &LayoutTestController::addDisallowedURL);
   BindMethod("setCallCloseOnWebViews", &LayoutTestController::setCallCloseOnWebViews);
   BindMethod("setPrivateBrowsingEnabled", &LayoutTestController::setPrivateBrowsingEnabled);
   BindMethod("setUseDashboardCompatibilityMode", &LayoutTestController::setUseDashboardCompatibilityMode);
-  BindMethod("setCustomPolicyDelegate", &LayoutTestController::setCustomPolicyDelegate);
 
   // This typo (missing 'i') is intentional as it matches the typo in the layout test
   // see: LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html.
   // If Apple ever fixes this, we'll need to update it.
   BindMethod("setUseDashboardCompatiblityMode", &LayoutTestController::setUseDashboardCompatibilityMode);
 
   // The fallback method is called when an unknown method is invoked.
   BindFallbackMethod(&LayoutTestController::fallbackMethod);
 
   // Shared properties.
@@ skipping 303 matching lines @@
 void LayoutTestController::LocationChangeDone() {
   webHistoryItemCount_.Set(shell_->navigation_controller()->GetEntryCount());
 
   // no more new work after the first complete load.
   work_queue_.set_frozen(true);
 
   if (!wait_until_done_)
     work_queue_.ProcessWorkSoon();
 }
 
+void LayoutTestController::PolicyDelegateDone() {
+  if (!shell_->layout_test_mode())
+    return;
+
+  DCHECK(wait_until_done_);
+  shell_->TestFinished();
+  wait_until_done_ = false;
+}
+
 void LayoutTestController::setCanOpenWindows(
     const CppArgumentList& args, CppVariant* result) {
   can_open_windows_ = true;
   result->SetNull();
 }
 
 void LayoutTestController::setTabKeyCyclesThroughElements(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isBool()) {
     shell_->webView()->SetTabKeyCyclesThroughElements(args[0].ToBoolean());
@@ skipping 86 matching lines @@
 
 void LayoutTestController::setUseDashboardCompatibilityMode(
     const CppArgumentList& args, CppVariant* result) {
   // We have no need to support Dashboard Compatibility Mode (mac-only)
   result->SetNull();
 }
 
 void LayoutTestController::setCustomPolicyDelegate(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isBool()) {
-    shell_->delegate()->SetCustomPolicyDelegate(args[0].value.boolValue);
+    bool enable = args[0].value.boolValue;
+    bool permissive = false;
+    if (args.size() > 1 && args[1].isBool())
+      permissive = args[1].value.boolValue;
+    shell_->delegate()->SetCustomPolicyDelegate(enable, permissive);
   }
 
   result->SetNull();
 }
 
+void LayoutTestController::waitForPolicyDelegate(
+    const CppArgumentList& args, CppVariant* result) {
+  shell_->delegate()->WaitForPolicyDelegate();
+  wait_until_done_ = true;
+  result->SetNull();
+}
+
 void LayoutTestController::pathToLocalResource(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
   if (args.size() <= 0 || !args[0].isString())
     return;
 
   std::string url = args[0].ToString();
   if (StartsWithASCII(url, "/tmp/", true)) {
     // We want a temp file.
     std::wstring path;
@@ skipping 167 matching lines @@
 void LayoutTestController::fallbackMethod(
     const CppArgumentList& args, CppVariant* result) {
   std::wstring message(L"JavaScript ERROR: unknown method called on LayoutTestController");
   if (!shell_->layout_test_mode()) {
     logging::LogMessage("CONSOLE:", 0).stream() << message;
   } else {
     printf("CONSOLE MESSAGE: %S\n", message.c_str());
   }
   result->SetNull();
 }