Make BrowserAccessibilityManager cross platform. Step 1....

chrome/browser/renderer_host/render_widget_host_view_win.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.
 
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/histogram.h"
 #include "base/i18n/rtl.h"
 #include "base/process_util.h"
+#include "base/scoped_comptr_win.h"
 #include "base/thread.h"
 #include "base/win_util.h"
-#include "chrome/browser/browser_accessibility_win.h"
-#include "chrome/browser/browser_accessibility_manager_win.h"
+#include "chrome/browser/accessibility/browser_accessibility.h"
+#include "chrome/browser/accessibility/browser_accessibility_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/renderer_host/backing_store.h"
 #include "chrome/browser/renderer_host/backing_store_win.h"
 #include "chrome/browser/renderer_host/gpu_view_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 1453 matching lines @@
 }
 
 void RenderWidgetHostViewWin::OnAccessibilityNotifications(
     const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params) {
   if (!browser_accessibility_manager_.get()) {
     // Use empty document to process notifications
     webkit_glue::WebAccessibility empty_document;
     empty_document.role = WebAccessibility::ROLE_DOCUMENT;
     empty_document.state = 0;
     browser_accessibility_manager_.reset(
-        new BrowserAccessibilityManager(m_hWnd, empty_document, this));
+        BrowserAccessibilityManager::Create(m_hWnd, empty_document, this));
   }
 
   browser_accessibility_manager_->OnAccessibilityNotifications(params);
 }
 
 void RenderWidgetHostViewWin::Observe(NotificationType type,
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
   DCHECK(type == NotificationType::RENDERER_PROCESS_TERMINATED);
 
@@ skipping 42 matching lines @@
   }
 
   if (!browser_accessibility_manager_.get()) {
     render_widget_host_->EnableRendererAccessibility();
 
     // Return busy document tree while renderer accessibility tree loads.
     webkit_glue::WebAccessibility loading_tree;
     loading_tree.role = WebAccessibility::ROLE_DOCUMENT;
     loading_tree.state = (1 << WebAccessibility::STATE_BUSY);
     browser_accessibility_manager_.reset(
-      new BrowserAccessibilityManager(m_hWnd, loading_tree, this));
+      BrowserAccessibilityManager::Create(m_hWnd, loading_tree, this));
   }
 
-  BrowserAccessibility* root = browser_accessibility_manager_->GetRoot();
-  if (root) {
-    return LresultFromObject(IID_IAccessible, wparam,
-        static_cast<IAccessible*>(root->NewReference()));
+  ScopedComPtr<IAccessible> root(
+      browser_accessibility_manager_->GetRootAccessible());
+  if (root.get()) {
+    return LresultFromObject(IID_IAccessible, wparam, root.Detach());
   }
 
   handled = false;
   return static_cast<LRESULT>(0L);
 }
 
 void RenderWidgetHostViewWin::OnFinalMessage(HWND window) {
   // When the render widget host is being destroyed, it ends up calling
   // WillDestroyRenderWidget (through the RENDER_WIDGET_HOST_DESTROYED
   // notification) which NULLs render_widget_host_.
@@ skipping 113 matching lines @@
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView native_view) {
   if (::IsWindow(native_view)) {
     HANDLE raw_render_host_view = ::GetProp(native_view,
                                             kRenderWidgetHostViewKey);
     if (raw_render_host_view)
       return reinterpret_cast<RenderWidgetHostView*>(raw_render_host_view);
   }
   return NULL;
 }