Revert 47582 - Fix flakyness of browser_tests:BrowserViewsAccessibilityTest.TestChromeWindowAccObj

1. Finish nagivation to "about:blank" before checking the name returned by the window's IAccessible.
2. Use ScopedComPtr in this file.

BUG=44486
TEST=browser_tests:BrowserViewsAccessibilityTest.TestChromeWindowAccObj

Review URL: http://codereview.chromium.org/2092011

TBR=ctguil@chromium.org
Review URL: http://codereview.chromium.org/2132013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47594 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 12 deletions

diff --git a/chrome/browser/views/browser_views_accessibility_browsertest.cc b/chrome/browser/views/browser_views_accessibility_browsertest.cc
index 517ee7e..bddbb2d 100644
--- a/chrome/browser/views/browser_views_accessibility_browsertest.cc
+++ b/chrome/browser/views/browser_views_accessibility_browsertest.cc
@@ -5,16 +5,13 @@
 #include <oleacc.h>
 
 #include "app/l10n_util.h"
-#include "base/scoped_comptr_win.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/toolbar_view.h"
-#include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
-#include "chrome/test/ui_test_utils.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "views/accessibility/view_accessibility_wrapper.h"
@@ -92,7 +89,7 @@ class BrowserViewsAccessibilityTest : public InProcessBrowserTest {
                                    int32 role) {
     ASSERT_TRUE(NULL != view);
 
-    ScopedComPtr<IAccessible> acc_obj;
+    IAccessible* acc_obj = NULL;
     HRESULT hr = view->GetViewAccessibilityWrapper()->GetInstance(
         IID_IAccessible, reinterpret_cast<void**>(&acc_obj));
     ASSERT_EQ(S_OK, hr);
@@ -128,24 +125,26 @@ class BrowserViewsAccessibilityTest : public InProcessBrowserTest {
 
 // Retrieve accessibility object for main window and verify accessibility info.
 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest,
-                       TestChromeWindowAccObj) {
+                       FLAKY_TestChromeWindowAccObj) {
   BrowserWindow* browser_window = browser()->window();
   ASSERT_TRUE(NULL != browser_window);
+
   HWND hwnd = browser_window->GetNativeHandle();
   ASSERT_TRUE(NULL != hwnd);
 
   // Get accessibility object.
-  ScopedComPtr<IAccessible> acc_obj;
+  IAccessible* acc_obj = NULL;
   HRESULT hr = ::AccessibleObjectFromWindow(hwnd, OBJID_WINDOW, IID_IAccessible,
                                             reinterpret_cast<void**>(&acc_obj));
   ASSERT_EQ(S_OK, hr);
   ASSERT_TRUE(NULL != acc_obj);
 
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
-  std::wstring title =
-      l10n_util::GetStringF(IDS_BROWSER_WINDOW_TITLE_FORMAT,
-                            ASCIIToWide(chrome::kAboutBlankURL));
-  TestAccessibilityInfo(acc_obj, title, ROLE_SYSTEM_WINDOW);
+  // TODO(ctguil): Fix. The window title could be "New Tab - Chromium" or
+  // "about:blank - Chromium"
+  TestAccessibilityInfo(acc_obj, l10n_util::GetString(IDS_PRODUCT_NAME),
+                        ROLE_SYSTEM_WINDOW);
+
+  acc_obj->Release();
 }
 
 // Retrieve accessibility object for non client view and verify accessibility
@@ -283,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest,
             AccessibilityTypes::ROLE_DIALOG);
 
   // Also test the accessibility object directly.
-  ScopedComPtr<IAccessible> acc_obj;
+  IAccessible* acc_obj = NULL;
   HRESULT hr =
     ::AccessibleObjectFromWindow(aboutChromeWindow->GetNativeWindow(),
                                  OBJID_CLIENT,
@@ -294,6 +293,8 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest,
 
   TestAccessibilityInfo(acc_obj, l10n_util::GetString(IDS_ABOUT_CHROME_TITLE),
                         ROLE_SYSTEM_DIALOG);
+
+  acc_obj->Release();
 }
 }  // Namespace.