Change the default cookie policy to be closer to the default in WebKit's Dump...

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"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
+#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using std::string;
 using std::wstring;
 
 using WebKit::WebScriptSource;
 using WebKit::WebString;
 
 #if defined(OS_WIN)
@@ skipping 58 matching lines @@
   BindMethod("queueReload", &LayoutTestController::queueReload);
   BindMethod("queueLoadingScript", &LayoutTestController::queueLoadingScript);
   BindMethod("queueNonLoadingScript", &LayoutTestController::queueNonLoadingScript);
   BindMethod("queueLoad", &LayoutTestController::queueLoad);
   BindMethod("queueBackNavigation", &LayoutTestController::queueBackNavigation);
   BindMethod("queueForwardNavigation", &LayoutTestController::queueForwardNavigation);
   BindMethod("windowCount", &LayoutTestController::windowCount);
   BindMethod("setCanOpenWindows", &LayoutTestController::setCanOpenWindows);
   BindMethod("setCloseRemainingWindowsWhenComplete", &LayoutTestController::setCloseRemainingWindowsWhenComplete);
   BindMethod("objCIdentityIsEqual", &LayoutTestController::objCIdentityIsEqual);
+  BindMethod("setAlwaysAcceptCookies", &LayoutTestController::setAlwaysAcceptCookies);
   BindMethod("setWindowIsKey", &LayoutTestController::setWindowIsKey);
   BindMethod("setTabKeyCyclesThroughElements", &LayoutTestController::setTabKeyCyclesThroughElements);
   BindMethod("setUserStyleSheetLocation", &LayoutTestController::setUserStyleSheetLocation);
   BindMethod("setUserStyleSheetEnabled", &LayoutTestController::setUserStyleSheetEnabled);
   BindMethod("pathToLocalResource", &LayoutTestController::pathToLocalResource);
   BindMethod("addFileToPasteboardOnDrag", &LayoutTestController::addFileToPasteboardOnDrag);
   BindMethod("execCommand", &LayoutTestController::execCommand);
   BindMethod("isCommandEnabled", &LayoutTestController::isCommandEnabled);
   BindMethod("setPopupBlockingEnabled", &LayoutTestController::setPopupBlockingEnabled);
   BindMethod("setStopProvisionalFrameLoads", &LayoutTestController::setStopProvisionalFrameLoads);
@@ skipping 309 matching lines @@
   dump_window_status_changes_ = false;
   dump_title_changes_ = false;
   accepts_editing_ = true;
   wait_until_done_ = false;
   can_open_windows_ = false;
   should_add_file_to_pasteboard_ = false;
   stop_provisional_frame_loads_ = false;
   globalFlag_.Set(false);
   webHistoryItemCount_.Set(0);
 
+  SimpleResourceLoaderBridge::SetAcceptAllCookies(false);
   WebKit::resetOriginAccessWhiteLists();
 
   if (close_remaining_windows_) {
     // Iterate through the window list and close everything except the original
     // shell.  We don't want to delete elements as we're iterating, so we copy
     // to a temp vector first.
     WindowList* windows = TestShell::windowList();
     std::vector<gfx::NativeWindow> windows_to_delete;
     for (WindowList::iterator i = windows->begin(); i != windows->end(); ++i) {
       if (*i != shell_->mainWnd())
@@ skipping 51 matching lines @@
 }
 
 void LayoutTestController::setCloseRemainingWindowsWhenComplete(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isBool()) {
     close_remaining_windows_ = args[0].value.boolValue;
   }
   result->SetNull();
 }
 
+void LayoutTestController::setAlwaysAcceptCookies(
+    const CppArgumentList& args, CppVariant* result) {
+  if (args.size() > 0) {
+    SimpleResourceLoaderBridge::SetAcceptAllCookies(CppVariantToBool(args[0]));
+  }
+  result->SetNull();
+}
+
 void LayoutTestController::setWindowIsKey(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isBool()) {
     shell_->SetFocus(shell_->webViewHost(), args[0].value.boolValue);
   }
   result->SetNull();
 }
 
 void LayoutTestController::setUserStyleSheetEnabled(
     const CppArgumentList& args, CppVariant* result) {
@@ skipping 293 matching lines @@
 
 void LayoutTestController::evaluateScriptInIsolatedWorld(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isString()) {
     WebScriptSource source(WebString::fromUTF8(args[0].ToString()));
     shell_->webView()->GetMainFrame()->executeScriptInNewWorld(&source, 1, 1);
   }
   result->SetNull();
 }
 
-// Need these conversions because the format of the value for overridePreference
+// Need these conversions because the format of the value for booleans
 // may vary - for example, on mac "1" and "0" are used for boolean.
 bool LayoutTestController::CppVariantToBool(const CppVariant& value) {
   if (value.isBool())
     return value.ToBoolean();
   else if (value.isInt32())
     return 0 != value.ToInt32();
   else if (value.isString()) {
     std::string valueString = value.ToString();
     if (valueString == "true")
       return true;
     if (valueString == "false")
       return false;
   }
   shell_->delegate()->AddMessageToConsole(shell_->webView(),
-      L"Invalid value for preference. Expected boolean value.", 0, L"");
+      L"Invalid value. Expected boolean value.", 0, L"");
   return false;
 }
 
 int32 LayoutTestController::CppVariantToInt32(const CppVariant& value) {
     if (value.isInt32())
     return value.ToInt32();
   else if (value.isString()) {
     int number;
     if (StringToInt(value.ToString(), &number))
       return number;
@@ skipping 100 matching lines @@
 
   WebKit::WebURL url(GURL(args[0].ToString()));
   if (!url.isValid())
     return;
 
   WebKit::whiteListAccessFromOrigin(url,
                                     WebString::fromUTF8(args[1].ToString()),
                                     WebString::fromUTF8(args[2].ToString()),
                                     args[3].ToBoolean());
 }