Make web content accessibility tree a descendant of main window's tree again

chrome/browser/accessibility/browser_views_accessibility_browsertest.cc

 // Copyright (c) 2011 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 <oleacc.h>
 
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 66 matching lines @@
       return NULL;
 
     return browser_window_testing->GetBookmarkBarView();
   }
 
   // Retrieves and verifies the accessibility object for the given View.
   void TestViewAccessibilityObject(views::View* view, std::wstring name,
                                    int32 role) {
     ASSERT_TRUE(NULL != view);
 
-    TestAccessibilityInfo(
-        NativeViewAccessibilityWin::GetAccessibleForView(view),
-        name,
-        role);
+    TestAccessibilityInfo(view->GetNativeViewAccessible(), name, role);
   }
 
 
   // Verifies MSAA Name and Role properties of the given IAccessible.
   void TestAccessibilityInfo(IAccessible* acc_obj, std::wstring name,
                              int32 role) {
     // Verify MSAA Name property.
     BSTR acc_name;
 
     HRESULT hr = acc_obj->get_accName(id_self, &acc_name);
@@ skipping 165 matching lines @@
   ASSERT_EQ(S_OK, hr);
   ASSERT_TRUE(NULL != acc_obj);
 
   TestAccessibilityInfo(
       acc_obj,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE)),
       ROLE_SYSTEM_DIALOG);
 
   acc_obj->Release();
 }