chrome: Use base::MessageLoop. (Part 2)

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.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
@@ skipping 113 matching lines @@
   virtual void TearDown() {
 #if defined(USE_AURA)
     aura_test_helper_->TearDown();
 #endif
     delete views::ViewsDelegate::views_delegate;
     views::ViewsDelegate::views_delegate = NULL;
 
     // The Widget's FocusManager is deleted using DeleteSoon - this
     // forces it to be deleted now, so we don't have any memory leaks
     // when this method exits.
-    MessageLoop::current()->RunUntilIdle();
+    base::MessageLoop::current()->RunUntilIdle();
 
 #if defined(OS_WIN)
     ole_initializer_.reset();
 #endif
   }
 
   views::Widget* CreateWindowWithContents(views::View* contents) {
     gfx::NativeView context = NULL;
 #if defined(USE_AURA)
     context = aura_test_helper_->root_window();
@@ skipping 27 matching lines @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     ASSERT_EQ(type, chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED);
     const AccessibilityControlInfo* info =
         content::Details<const AccessibilityControlInfo>(details).ptr();
     focus_event_count_++;
     last_control_name_ = info->name();
     last_control_context_ = info->context();
   }
 
-  MessageLoopForUI message_loop_;
+  base::MessageLoopForUI message_loop_;
   int focus_event_count_;
   std::string last_control_name_;
   std::string last_control_context_;
   content::NotificationRegistrar registrar_;
   TestingProfile profile_;
 #if defined(OS_WIN)
   scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
 #endif
 #if defined(USE_AURA)
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
@@ skipping 32 matching lines @@
   EnableAccessibilityAndListenToFocusNotifications();
 
   // Change the accessible name of button3.
   button3->SetAccessibleName(ASCIIToUTF16(kButton3NewASCII));
 
   // Advance focus to the next button and test that we got the
   // expected notification with the name of button 2.
   views::FocusManager* focus_manager = contents->GetWidget()->GetFocusManager();
   focus_event_count_ = 0;
   focus_manager->AdvanceFocus(false);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(1, focus_event_count_);
   EXPECT_EQ(kButton2ASCII, last_control_name_);
 
   // Advance to button 3. Expect the new accessible name we assigned.
   focus_manager->AdvanceFocus(false);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(2, focus_event_count_);
   EXPECT_EQ(kButton3NewASCII, last_control_name_);
 
   // Advance to button 1 and check the notification.
   focus_manager->AdvanceFocus(false);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(3, focus_event_count_);
   EXPECT_EQ(kButton1ASCII, last_control_name_);
 
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, TestToolbarContext) {
   const char kToolbarNameASCII[] = "MyToolbar";
   const char kButtonNameASCII[] = "MyButton";
 
   // Create a toolbar with a button.
   views::View* contents = new ViewWithNameAndRole(
       ASCIIToUTF16(kToolbarNameASCII),
       ui::AccessibilityTypes::ROLE_TOOLBAR);
   views::LabelButton* button = new views::LabelButton(
       NULL, ASCIIToUTF16(kButtonNameASCII));
   button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button);
 
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
 
   EnableAccessibilityAndListenToFocusNotifications();
 
   // Set focus to the button.
   focus_event_count_ = 0;
   button->RequestFocus();
 
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // Test that we got the event with the expected name and context.
   EXPECT_EQ(kInitialFocusCount, focus_event_count_);
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kToolbarNameASCII, last_control_context_);
 
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, TestAlertContext) {
@@ skipping 13 matching lines @@
 
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
 
   EnableAccessibilityAndListenToFocusNotifications();
 
   // Set focus to the button.
   focus_event_count_ = 0;
   button->RequestFocus();
 
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 
   // Test that we got the event with the expected name and context.
   EXPECT_EQ(kInitialFocusCount, focus_event_count_);
   EXPECT_EQ(kButtonNameASCII, last_control_name_);
   EXPECT_EQ(kAlertTextASCII, last_control_context_);
 
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, StateChangeAfterNotification) {
@@ skipping 21 matching lines @@
   child->RequestFocus();
 
   // 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, focus_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.
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(kInitialFocusCount, focus_event_count_);
   EXPECT_EQ(kNewNameASCII, last_control_name_);
 
   window->CloseNow();
 }
 
 TEST_F(AccessibilityEventRouterViewsTest, NotificationOnDeletedObject) {
   const char kContentsNameASCII[] = "Contents";
   const char kNameASCII[] = "OldName";
 
@@ skipping 17 matching lines @@
   child->RequestFocus();
 
   // Delete the child!
   delete child;
 
   // We shouldn't get the notification right away.
   EXPECT_EQ(0, focus_event_count_);
 
   // Process anything in the event loop. We shouldn't get a notification
   // because the view is no longer valid, and this shouldn't crash.
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(0, focus_event_count_);
 
   window->CloseNow();
 }