Split out the MSCOM pieces of BrowserAccessibilityWin into a seperate class.

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 98 matching lines @@
     AccessibilityMode accessibility_mode) {
   AccessibilityNotificationWaiter waiter(
       shell()->web_contents(), accessibility_mode, ui::AX_EVENT_LOAD_COMPLETE);
   GURL html_data_url("data:text/html," + html);
   NavigateToURL(shell(), html_data_url);
   waiter.WaitForNotification();
 }
 
 // Retrieve the MSAA client accessibility object for the Render Widget Host View
 // of the selected tab.
 IAccessible* AccessibilityWinBrowserTest::GetRendererAccessible() {

[dmazzoni, 2017/05/08 04:45:24]

I love that this file didn't need any major changes, this function
just continues to work. Great for test coverage.

[dougt, 2017/05/08 16:53:35]

+1000

   content::WebContents* web_contents = shell()->web_contents();
   return web_contents->GetRenderWidgetHostView()->GetNativeViewAccessible();
 }
 
 void AccessibilityWinBrowserTest::ExecuteScript(const std::wstring& script) {
   shell()->web_contents()->GetMainFrame()->ExecuteJavaScriptForTests(script);
 }
 
 // Loads a page with  an input text field and places sample text in it. Also,
 // places the caret on the last character.
@@ skipping 1559 matching lines @@
   // Test special offsets.
   CheckTextAtOffset(textarea_text, IA2_TEXT_OFFSET_CARET,
       IA2_TEXT_BOUNDARY_WORD, 40, CONTENTS_LENGTH, L"like\".");
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
                        TestStaticTextAtOffsetWithBoundaryWord) {
   base::win::ScopedComPtr<IAccessibleText> paragraph_text;
   SetUpSampleParagraph(&paragraph_text);
   base::string16 embedded_character(
-      1, BrowserAccessibilityWin::kEmbeddedCharacter);
+      1, BrowserAccessibilityComWin::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 ");
   words.push_back(embedded_character);
   words.push_back(L"of ");
   words.push_back(L"conflict ");
@@ skipping 331 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