Make BrowserAccessibilityManager cross platform. Step 1....

chrome/browser/accessibility/browser_accessibility_win_unittest.cc

Index: chrome/browser/accessibility/browser_accessibility_win_unittest.cc
===================================================================
--- chrome/browser/accessibility/browser_accessibility_win_unittest.cc	(revision 0)
+++ chrome/browser/accessibility/browser_accessibility_win_unittest.cc	(working copy)
@@ -4,15 +4,15 @@
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_comptr_win.h"
-#include "chrome/browser/browser_accessibility_manager_win.h"
-#include "chrome/browser/browser_accessibility_win.h"
+#include "chrome/browser/accessibility/browser_accessibility_manager_win.h"
+#include "chrome/browser/accessibility/browser_accessibility_win.h"
 #include "chrome/common/render_messages_params.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using webkit_glue::WebAccessibility;
 
 // Subclass of BrowserAccessibility that counts the number of instances.
-class CountedBrowserAccessibility : public BrowserAccessibility {
+class CountedBrowserAccessibility : public BrowserAccessibilityWin {
  public:
   CountedBrowserAccessibility() { global_obj_count_++; }
   virtual ~CountedBrowserAccessibility() { global_obj_count_--; }
@@ -25,7 +25,7 @@
 class CountedBrowserAccessibilityFactory : public BrowserAccessibilityFactory {
  public:
   virtual ~CountedBrowserAccessibilityFactory() {}
-  virtual BrowserAccessibility* Create() {
+  virtual BrowserAccessibilityWin* Create() {
     CComObject<CountedBrowserAccessibility>* instance;
     HRESULT hr = CComObject<CountedBrowserAccessibility>::CreateInstance(
         &instance);
@@ -54,8 +54,7 @@
     ::CoInitialize(NULL);
   }
 
-  virtual void TearDown()
-  {
+  virtual void TearDown() {
     ::CoUninitialize();
   }
 };
@@ -92,7 +91,7 @@
   // ownership of the factory.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
-      new BrowserAccessibilityManager(
+      new BrowserAccessibilityManagerWin(
           GetDesktopWindow(), root, NULL,
           new CountedBrowserAccessibilityFactory());
   ASSERT_EQ(3, CountedBrowserAccessibility::global_obj_count_);
@@ -103,11 +102,11 @@
 
   // Construct a manager again, and this time use the IAccessible interface
   // to get new references to two of the three nodes in the tree.
-  manager = new BrowserAccessibilityManager(
+  manager = new BrowserAccessibilityManagerWin(
       GetDesktopWindow(), root, NULL,
       new CountedBrowserAccessibilityFactory());
   ASSERT_EQ(3, CountedBrowserAccessibility::global_obj_count_);
-  BrowserAccessibility* root_accessible = manager->GetRoot();
+  IAccessible* root_accessible = manager->GetRootAccessible();
   IDispatch* root_iaccessible = NULL;
   IDispatch* child1_iaccessible = NULL;
   VARIANT var_child;
@@ -153,15 +152,15 @@
   // and a factory for an instance-counting BrowserAccessibility.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
-      new BrowserAccessibilityManager(
+      new BrowserAccessibilityManagerWin(
           GetDesktopWindow(), root, NULL,
           new CountedBrowserAccessibilityFactory());
 
   // Query for the text IAccessible and verify that it returns "old text" as its
   // value.
   ScopedComPtr<IDispatch> text_dispatch;
-  HRESULT hr = manager->GetRoot()->get_accChild(CreateI4Variant(1),
-                                                text_dispatch.Receive());
+  HRESULT hr = manager->GetRootAccessible()->get_accChild(
+      CreateI4Variant(1), text_dispatch.Receive());
   ASSERT_EQ(S_OK, hr);
 
   ScopedComPtr<IAccessible> text_accessible;
@@ -189,7 +188,7 @@
 
   // Query for the text IAccessible and verify that it now returns "new text"
   // as its value.
-  hr = manager->GetRoot()->get_accChild(
+  hr = manager->GetRootAccessible()->get_accChild(
       CreateI4Variant(1),
       text_dispatch.Receive());
   ASSERT_EQ(S_OK, hr);
@@ -240,7 +239,7 @@
   // ownership of the factory.
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
-      new BrowserAccessibilityManager(
+      new BrowserAccessibilityManagerWin(

[dmazzoni, 2010/10/01 17:14:37]

Can you use BrowserAccessibilityManager::Create instead? Or would it be too
tricky to move the factory up to browser_accessibility_manager.h?

[Chris Guillory, 2010/10/01 17:42:23]

I think factory is one of the things that should move up. I'll add this as a
todo for now.

           GetDesktopWindow(), root, NULL,
           new CountedBrowserAccessibilityFactory());
   ASSERT_EQ(4, CountedBrowserAccessibility::global_obj_count_);