Switched to using |AXPosition| for calculating word and line boundaries on Windows.

content/browser/accessibility/accessibility_win_browsertest.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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
@@ skipping 1683 matching lines @@
   base::win::ScopedComPtr<IAccessibleText> paragraph_text;
   SetUpSampleParagraph(&paragraph_text);
   base::string16 embedded_character(
       1, BrowserAccessibilityWin::kEmbeddedCharacter);
   std::vector<std::wstring> words;
   words.push_back(L"Game ");
   words.push_back(L"theory ");
   words.push_back(L"is \"");
   words.push_back(L"the ");
   words.push_back(L"study ");
-  words.push_back(L"of " + embedded_character + L' ');
+  words.push_back(L"of ");
+  words.push_back(embedded_character);
   words.push_back(L"of ");
   words.push_back(L"conflict ");
   words.push_back(L"and\n");
   words.push_back(L"cooperation ");
   words.push_back(L"between ");
   words.push_back(L"intelligent ");
   words.push_back(L"rational ");
   words.push_back(L"decision-");
   words.push_back(L"makers.\"");
 
   // Try to retrieve one word after another.
   LONG word_start_offset = 0;
   for (auto& word : words) {
     LONG word_end_offset = word_start_offset + word.size();
     CheckTextAtOffset(paragraph_text, word_start_offset, IA2_TEXT_BOUNDARY_WORD,
                       word_start_offset, word_end_offset, word);
     word_start_offset = word_end_offset;
+    // If the word boundary is inside an embedded object, |word_end_offset|
+    // should be one past the embedded object character. To get to the start of
+    // the next word, we have to skip the space between the embedded object
+    // character and the next word.
+    if (word == embedded_character)
+      ++word_start_offset;
   }
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
                        TestTextAtOffsetWithBoundarySentence) {
   base::win::ScopedComPtr<IAccessibleText> input_text;
   SetUpInputField(&input_text);
 
   // Sentence navigation is not currently implemented.
   LONG start_offset = 0;
@@ skipping 302 matching lines @@
   EXPECT_HRESULT_SUCCEEDED(accessible_cell->get_rowIndex(&row_index));
   EXPECT_HRESULT_SUCCEEDED(accessible_cell->get_columnIndex(&column_index));
   EXPECT_EQ(1, row_index);
   EXPECT_EQ(1, column_index);
   variant.Reset();
   name.Reset();
   accessible_cell.Reset();
 }
 
 }  // namespace content