Reset editing behavior in LayoutTestController::Reset()

webkit/tools/test_shell/layout_test_controller.cc

 // Copyright (c) 2010 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 481 matching lines @@
   if (shell_) {
     shell_->webView()->setZoomLevel(false, 0);
     shell_->webView()->setTabKeyCyclesThroughElements(true);
 #if defined(TOOLKIT_GTK)
     // (Constants copied because we can't depend on the header that defined
     // them from this file.)
     shell_->webView()->setSelectionColors(
         0xff1e90ff, 0xff000000, 0xffc8c8c8, 0xff323232);
 #endif  // defined(TOOLKIT_GTK)
     shell_->webView()->removeAllUserContent();
+
+    // Reset editingBehavior to a reasonable default between tests
+    // see http://trac.webkit.org/changeset/60158
+    // DumpRenderTree resets this in TestShell::resetWebSettings()
+    // called in TestShell::resetTestController().
+    // test_shell doesn't have ResetWebSettings(), so do this here,
+    // which is also called in TestShell::ResetTestController().
+#if defined(OS_MACOSX)
+    shell_->webView()->settings()->setEditingBehavior(
+        WebKit::WebSettings::EditingBehaviorMac);
+#else
+    shell_->webView()->settings()->setEditingBehavior(
+        WebKit::WebSettings::EditingBehaviorWin);
+#endif
   }
   generate_pixel_results_ = true;
   dump_as_text_ = false;
   dump_editing_callbacks_ = false;
   dump_frame_load_callbacks_ = false;
   dump_resource_load_callbacks_ = false;
   dump_back_forward_list_ = false;
   dump_child_frame_scroll_positions_ = false;
   dump_child_frames_as_text_ = false;
   dump_window_status_changes_ = false;
@@ skipping 892 matching lines @@
 
 void LayoutTestController::markerTextForListItem(const CppArgumentList& args,
                                                  CppVariant* result) {
   WebElement element;
   if (!WebBindings::getElement(args[0].value.objectValue, &element))
     result->SetNull();
   else
     result->Set(
         element.document().frame()->markerTextForListItem(element).utf8());
 }