Revert of Fixes for contenteditable caret and selection handling in Windows.

content/browser/accessibility/browser_accessibility_win_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_variant.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
@@ skipping 858 matching lines @@
   // -2 is never a valid offset.
   LONG caret_offset = -2;
   LONG n_selections = -2;
   LONG selection_start = -2;
   LONG selection_end = -2;
 
   // Test get_caretOffset.
   HRESULT hr = combo_box_accessible->get_caretOffset(&caret_offset);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(1L, caret_offset);
-  // The caret should be at the end of the selection.
+  // The caret should be at the start of the selection.
   hr = text_field_accessible->get_caretOffset(&caret_offset);;
   EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(2L, caret_offset);
+  EXPECT_EQ(1L, caret_offset);
 
   // Move the focus to the text field.
   combo_box.state &= ~(1 << ui::AX_STATE_FOCUSED);
   text_field.state |= 1 << ui::AX_STATE_FOCUSED;
   manager->SetFocus(text_field_accessible, false /* notify */);
   ASSERT_EQ(text_field_accessible,
       manager->GetFocus(root_accessible)->ToBrowserAccessibilityWin());
 
   // The caret should not have moved.
   hr = text_field_accessible->get_caretOffset(&caret_offset);;
   EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(2L, caret_offset);
+  EXPECT_EQ(1L, caret_offset);
 
   // Test get_nSelections.
   hr = combo_box_accessible->get_nSelections(&n_selections);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(0L, n_selections);
   hr = text_field_accessible->get_nSelections(&n_selections);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(1L, n_selections);
 
   // Test get_selection.
@@ skipping 69 matching lines @@
       ASSERT_NE(nullptr, root_accessible);
   ASSERT_EQ(1, root_accessible->PlatformChildCount());
 
   BrowserAccessibilityWin* div_editable_accessible =
       root_accessible->PlatformGetChild(0)->ToBrowserAccessibilityWin();
   ASSERT_NE(nullptr, div_editable_accessible);
   ASSERT_EQ(2, div_editable_accessible->PlatformChildCount());
 
   // -2 is never a valid offset.
   LONG caret_offset = -2;
-  LONG n_selections = -2;
-
-  // No selection should be present.
-  HRESULT hr = div_editable_accessible->get_nSelections(&n_selections);
-  EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(0L, n_selections);
 
   // The caret should be on the embedded object character.
-  hr = div_editable_accessible->get_caretOffset(&caret_offset);
+  HRESULT hr = div_editable_accessible->get_caretOffset(&caret_offset);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(6L, caret_offset);
 
   // Move the focus to the content editable.
   div_editable.state |= 1 << ui::AX_STATE_FOCUSED;
   manager->SetFocus(div_editable_accessible, false /* notify */);
   ASSERT_EQ(div_editable_accessible,
       manager->GetFocus(root_accessible)->ToBrowserAccessibilityWin());
 
   BrowserAccessibilityWin* text_accessible =
       div_editable_accessible->PlatformGetChild(0)->ToBrowserAccessibilityWin();
   ASSERT_NE(nullptr, text_accessible);
   BrowserAccessibilityWin* link_accessible =
       div_editable_accessible->PlatformGetChild(1)->ToBrowserAccessibilityWin();
   ASSERT_NE(nullptr, link_accessible);
   ASSERT_EQ(1, link_accessible->PlatformChildCount());
 
   BrowserAccessibilityWin* link_text_accessible =
       link_accessible->PlatformGetChild(0)->ToBrowserAccessibilityWin();
   ASSERT_NE(nullptr, link_text_accessible);
 
   // The caret should not have moved.
-  hr = div_editable_accessible->get_nSelections(&n_selections);
-  EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(0L, n_selections);
   hr = div_editable_accessible->get_caretOffset(&caret_offset);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(6L, caret_offset);
 
-  hr = link_accessible->get_nSelections(&n_selections);
-  EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(0L, n_selections);
-  hr = link_text_accessible->get_nSelections(&n_selections);
-  EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(0L, n_selections);
-
   hr = link_accessible->get_caretOffset(&caret_offset);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(1L, caret_offset);
   hr = link_text_accessible->get_caretOffset(&caret_offset);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(1L, caret_offset);
 
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
-TEST_F(BrowserAccessibilityTest, TestSelectionInContentEditables) {
+TEST_F(BrowserAccessibilityTest, DISABLED_TestSelectionInContentEditables) {
   ui::AXNodeData root;
   root.id = 1;
   root.role = ui::AX_ROLE_ROOT_WEB_AREA;
   root.state = (1 << ui::AX_STATE_READ_ONLY) | (1 << ui::AX_STATE_FOCUSABLE);
 
   ui::AXNodeData div_editable;
   div_editable.id = 2;
   div_editable.role = ui::AX_ROLE_DIV;
   div_editable.state = (1 << ui::AX_STATE_FOCUSABLE);
 
@@ skipping 93 matching lines @@
       0L /* selection_index */, &selection_start, &selection_end);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(0L, selection_start);
   EXPECT_EQ(4L, selection_end);
   hr = link_text_accessible->get_selection(
       0L /* selection_index */, &selection_start, &selection_end);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(0L, selection_start);
   EXPECT_EQ(4L, selection_end);
 
-  // The caret should be at the focus (the end) of the selection.
+  // The caret should be at the anchor (the start) of the selection.
   hr = div_editable_accessible->get_caretOffset(&caret_offset);;
   EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(7L, caret_offset);
+  EXPECT_EQ(1L, caret_offset);
 
   // Move the focus to the content editable.
   div_editable.state |= 1 << ui::AX_STATE_FOCUSED;
   manager->SetFocus(div_editable_accessible, false /* notify */);
   ASSERT_EQ(div_editable_accessible,
       manager->GetFocus(root_accessible)->ToBrowserAccessibilityWin());
 
   // The caret should not have moved.
   hr = div_editable_accessible->get_caretOffset(&caret_offset);;
   EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(7L, caret_offset);
+  EXPECT_EQ(1L, caret_offset);
 
-  // The caret offset should reflect the position of the selection's focus in
-  // any given object.
+  // The HRESULT should be S_FALSE if the caret is not in the given object.
   hr = link_accessible->get_caretOffset(&caret_offset);;
-  EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(4L, caret_offset);
+  EXPECT_EQ(S_FALSE, hr);
+  EXPECT_EQ(-1L, caret_offset);
   hr = link_text_accessible->get_caretOffset(&caret_offset);;
-  EXPECT_EQ(S_OK, hr);
-  EXPECT_EQ(4L, caret_offset);
+  EXPECT_EQ(S_FALSE, hr);
+  EXPECT_EQ(-1L, caret_offset);
 
   hr = div_editable_accessible->get_selection(
       0L /* selection_index */, &selection_start, &selection_end);;
   EXPECT_EQ(S_OK, hr);
   EXPECT_EQ(1L, selection_start);
   EXPECT_EQ(7L, selection_end);
 
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::num_instances());
 }
 
 }  // namespace content