The 2 layout test regressions happened due to changes in the test shell....

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/WebScriptSource.h"
-#include "webkit/api/public/WebSettings.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.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;
@@ skipping 520 matching lines @@
   std::string command = args[0].ToString();
   bool rv = shell_->webView()->GetFocusedFrame()->isCommandEnabled(
       WebString::fromUTF8(command));
   result->Set(rv);
 }
 
 void LayoutTestController::setPopupBlockingEnabled(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isBool()) {
     bool block_popups = args[0].ToBoolean();
-    shell_->webView()->GetSettings()->setJavaScriptCanOpenWindowsAutomatically(
-        !block_popups);
+    WebPreferences* prefs = shell_->GetWebPreferences();
+    prefs->javascript_can_open_windows_automatically = !block_popups;
+    prefs->Apply(shell_->webView());
   }
   result->SetNull();
 }
 
 void LayoutTestController::setUseDashboardCompatibilityMode(
     const CppArgumentList& args, CppVariant* result) {
   // We have no need to support Dashboard Compatibility Mode (mac-only)
   result->SetNull();
 }
 
@@ skipping 126 matching lines @@
       shell_->webView(), element_id));
 }
 
 void LayoutTestController::numberOfActiveAnimations(const CppArgumentList& args,
                                                     CppVariant* result) {
   result->Set(webkit_glue::NumberOfActiveAnimations(shell_->webView()));
 }
 
 void LayoutTestController::disableImageLoading(const CppArgumentList& args,
                                                CppVariant* result) {
-  shell_->webView()->GetSettings()->setLoadsImagesAutomatically(false);
+    WebPreferences* prefs = shell_->GetWebPreferences();

[darin (slow to review), 2009/08/18 18:02:47]

nit: 2 space indent

+    prefs->loads_images_automatically = false;
+    prefs->Apply(shell_->webView());
   result->SetNull();
 }
 
 void LayoutTestController::setIconDatabaseEnabled(const CppArgumentList& args,
                                                   CppVariant* result) {
   // We don't use the WebKit icon database.
   result->SetNull();
 }
 
 //
@@ skipping 63 matching lines @@
   result->SetNull();
 }
 void LayoutTestController::setPrivateBrowsingEnabled(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 }
 
 void LayoutTestController::setXSSAuditorEnabled(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isBool()) {
-    bool enabled = args[0].value.boolValue;
-    shell_->webView()->GetSettings()->setXSSAuditorEnabled(enabled);
+    WebPreferences* prefs = shell_->GetWebPreferences();
+    prefs->xss_auditor_enabled = args[0].value.boolValue;
+    prefs->Apply(shell_->webView());
   }
   result->SetNull();
 }
 
 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);
   }
@@ skipping 110 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();
 }