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

content/browser/accessibility/accessibility_event_recorder_win.cc

 // Copyright 2014 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 "content/browser/accessibility/accessibility_event_recorder.h"
 
 #include <oleacc.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 42 matching lines @@
 }
 
 std::string BstrToUTF8(BSTR bstr) {
   base::string16 str16(bstr, SysStringLen(bstr));
 
   // IAccessibleText returns the text you get by appending all static text
   // children, with an "embedded object character" for each non-text child.
   // Pretty-print the embedded object character as <obj> so that test output
   // is human-readable.
   base::StringPiece16 embedded_character(
-      &BrowserAccessibilityWin::kEmbeddedCharacter, 1);
+      &BrowserAccessibilityComWin::kEmbeddedCharacter, 1);
   base::ReplaceChars(str16, embedded_character, L"<obj>", &str16);
 
   return base::UTF16ToUTF8(str16);
 }
 
 std::string AccessibilityEventToStringUTF8(int32_t event_id) {
   return base::UTF16ToUTF8(AccessibilityEventToString(event_id));
 }
 
 }  // namespace
@@ skipping 206 matching lines @@
     return hr;
 
   // The above call to ::AccessibleObjectFromWindow fails for unknown
   // reasons every once in a while on the bots.  Work around it by grabbing
   // the object directly from the BrowserAccessibilityManager.
   HWND accessibility_hwnd =
       manager_->delegate()->AccessibilityGetAcceleratedWidget();
   if (accessibility_hwnd != hwnd)
     return E_FAIL;
 
-  IAccessible* obj = ToBrowserAccessibilityWin(manager_->GetRoot());
+  IAccessible* obj = ToBrowserAccessibilityComWin(manager_->GetRoot());
   obj->AddRef();
   *ppv_object = obj;
   return S_OK;
 }
 
 }  // namespace content