Remove more non-aura windows code.

chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
@@ skipping 20 matching lines @@
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
 #endif
 
 using base::ASCIIToUTF16;
 
-namespace {
-
-// The expected initial focus count.
-#if defined(OS_WIN) && !defined(USE_AURA)
-// On windows (non-aura) this code triggers activating the window. Activating
-// the window triggers clearing the focus then resetting it. This results in an
-// additional focus change.
-const int kInitialFocusCount = 2;
-#else
-const int kInitialFocusCount = 1;
-#endif
-
-}  // namespace
-
 class AccessibilityViewsDelegate : public views::TestViewsDelegate {
  public:
   AccessibilityViewsDelegate() {}
   virtual ~AccessibilityViewsDelegate() {}
 
   // Overridden from views::TestViewsDelegate:
   virtual void NotifyAccessibilityEvent(
       views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {
     AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent(
         view, event_type);
@@ skipping 209 matching lines @@
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
 
   // Set focus to the button.
   control_event_count_ = 0;
   button->RequestFocus();
 
   base::MessageLoop::current()->RunUntilIdle();
 
   // Test that we got the event with the expected name and context.
-  EXPECT_EQ(kInitialFocusCount, control_event_count_);
+  EXPECT_EQ(1, control_event_count_);
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kToolbarNameASCII, last_control_context_);
 
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, TestAlertContext) {
   const char kAlertTextASCII[] = "MyAlertText";
   const char kButtonNameASCII[] = "MyButton";
 
@@ skipping 11 matching lines @@
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
 
   // Set focus to the button.
   control_event_count_ = 0;
   button->RequestFocus();
 
   base::MessageLoop::current()->RunUntilIdle();
 
   // Test that we got the event with the expected name and context.
-  EXPECT_EQ(kInitialFocusCount, control_event_count_);
+  EXPECT_EQ(1, control_event_count_);
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kAlertTextASCII, last_control_context_);
 
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, StateChangeAfterNotification) {
   const char kContentsNameASCII[] = "Contents";
   const char kOldNameASCII[] = "OldName";
   const char kNewNameASCII[] = "NewName";
@@ skipping 17 matching lines @@
 
   // Change the child's name after the focus notification.
   child->set_name(ASCIIToUTF16(kNewNameASCII));
 
   // We shouldn't get the notification right away.
   EXPECT_EQ(0, control_event_count_);
 
   // Process anything in the event loop. Now we should get the notification,
   // and it should give us the new control name, not the old one.
   base::MessageLoop::current()->RunUntilIdle();
-  EXPECT_EQ(kInitialFocusCount, control_event_count_);
+  EXPECT_EQ(1, control_event_count_);
   EXPECT_EQ(kNewNameASCII, last_control_name_);
 
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, NotificationOnDeletedObject) {
   const char kContentsNameASCII[] = "Contents";
   const char kNameASCII[] = "OldName";
 
   // Create a toolbar with a button.
@@ skipping 143 matching lines @@
 
     AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
         menu_container,
         menu->GetMenuItemByID(kTestCases[i].command_id),
         &index,
         &count);
     EXPECT_EQ(kTestCases[i].expected_index, index) << "Case " << i;
     EXPECT_EQ(kTestCases[i].expected_count, count) << "Case " << i;
   }
 }