rename Run in MessageLoopForUI to RunWithDispatcher

views/focus/focus_manager_unittest.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 "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 960 matching lines @@
   content_view_->AddChildView(button);
   button->SetBounds(10, 10, 200, 30);
   content_view_->AddChildView(view);
   RunPendingMessages();
 
   TestFocusChangeListener listener;
   AddFocusChangeListener(&listener);
 
   view->RequestFocus();
   RunPendingMessages();
-  //  MessageLoopForUI::current()->Run(new AcceleratorHandler());
+  //  MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
 
   // Visual Studio 2010 has problems converting NULL to the null pointer for
   // std::pair.  See http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair
   // It will work if we pass nullptr.
 #if defined(_MSC_VER) && _MSC_VER >= 1600
   views::View* null_view = nullptr;
 #else
   views::View* null_view = NULL;
 #endif
 
@@ skipping 79 matching lines @@
       kDinerGameLinkID, kRidiculeLinkID, kClosetLinkID, kVisitingLinkID,
       kAmelieLinkID, kJoyeuxNoelLinkID, kCampingLinkID, kBriceDeNiceLinkID,
       kTaxiLinkID, kAsterixLinkID, kOKButtonID, kCancelButtonID, kHelpButtonID,
       kStyleContainerID, kBoldCheckBoxID, kItalicCheckBoxID,
       kUnderlinedCheckBoxID, kStyleHelpLinkID, kStyleTextEditID,
       kSearchTextfieldID, kSearchButtonID, kHelpLinkID,
       kThumbnailContainerID, kThumbnailStarID, kThumbnailSuperStarID };
 
   // Uncomment the following line if you want to test manually the UI of this
   // test.
-  // MessageLoopForUI::current()->Run(new AcceleratorHandler());
+  // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
 
   // Let's traverse the whole focus hierarchy (several times, to make sure it
   // loops OK).
   GetFocusManager()->ClearFocus();
   for (int i = 0; i < 3; ++i) {
     for (size_t j = 0; j < arraysize(kTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
@@ skipping 32 matching lines @@
 
   // Let's disable some views.
   for (size_t i = 0; i < arraysize(kDisabledIDs); i++) {
     View* v = FindViewByID(kDisabledIDs[i]);
     ASSERT_TRUE(v != NULL);
     v->SetEnabled(false);
   }
 
   // Uncomment the following line if you want to test manually the UI of this
   // test.
-  // MessageLoopForUI::current()->Run(new AcceleratorHandler());
+  // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
 
   View* focused_view;
   // Let's do one traversal (several times, to make sure it loops ok).
   GetFocusManager()->ClearFocus();
   for (int i = 0; i < 3; ++i) {
     for (size_t j = 0; j < arraysize(kTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
@@ skipping 31 matching lines @@
 
   // Let's make some views invisible.
   for (size_t i = 0; i < arraysize(kInvisibleIDs); i++) {
     View* v = FindViewByID(kInvisibleIDs[i]);
     ASSERT_TRUE(v != NULL);
     v->SetVisible(false);
   }
 
   // Uncomment the following line if you want to test manually the UI of this
   // test.
-  // MessageLoopForUI::current()->Run(new AcceleratorHandler());
+  // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
 
   View* focused_view;
   // Let's do one traversal (several times, to make sure it loops ok).
   GetFocusManager()->ClearFocus();
   for (int i = 0; i < 3; ++i) {
     for (size_t j = 0; j < arraysize(kTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
@@ skipping 310 matching lines @@
   mtv->AddAccelerator(Accelerator(ui::VKEY_0, false, false, false));
   mtv->AddAccelerator(Accelerator(ui::VKEY_1, false, false, false));
   content_view_->AddChildView(mtv);
   focus_manager->SetFocusedView(mtv);
 
   // First send a non-accelerator key sequence.
   PostKeyDown(ui::VKEY_9);
   PostKeyUp(ui::VKEY_9);
   AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
-  MessageLoopForUI::current()->Run(&accelerator_handler);
+  MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
   // Make sure we get a key-up and key-down.
   ASSERT_EQ(1U, mtv->keys_pressed().size());
   EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[0]);
   ASSERT_EQ(1U, mtv->keys_released().size());
   EXPECT_EQ(ui::VKEY_9, mtv->keys_released()[0]);
   EXPECT_FALSE(mtv->accelerator_pressed());
   mtv->Reset();
 
   // Same thing with repeat and more than one key at once.
   PostKeyDown(ui::VKEY_9);
   PostKeyDown(ui::VKEY_9);
   PostKeyDown(ui::VKEY_8);
   PostKeyDown(ui::VKEY_9);
   PostKeyDown(ui::VKEY_7);
   PostKeyUp(ui::VKEY_9);
   PostKeyUp(ui::VKEY_7);
   PostKeyUp(ui::VKEY_8);
   MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
-  MessageLoopForUI::current()->Run(&accelerator_handler);
+  MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
   // Make sure we get a key-up and key-down.
   ASSERT_EQ(5U, mtv->keys_pressed().size());
   EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[0]);
   EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[1]);
   EXPECT_EQ(ui::VKEY_8, mtv->keys_pressed()[2]);
   EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[3]);
   EXPECT_EQ(ui::VKEY_7, mtv->keys_pressed()[4]);
   ASSERT_EQ(3U, mtv->keys_released().size());
   EXPECT_EQ(ui::VKEY_9, mtv->keys_released()[0]);
   EXPECT_EQ(ui::VKEY_7, mtv->keys_released()[1]);
   EXPECT_EQ(ui::VKEY_8, mtv->keys_released()[2]);
   EXPECT_FALSE(mtv->accelerator_pressed());
   mtv->Reset();
 
   // Now send an accelerator key sequence.
   PostKeyDown(ui::VKEY_0);
   PostKeyUp(ui::VKEY_0);
   MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
-  MessageLoopForUI::current()->Run(&accelerator_handler);
+  MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
   EXPECT_TRUE(mtv->keys_pressed().empty());
   EXPECT_TRUE(mtv->keys_released().empty());
   EXPECT_TRUE(mtv->accelerator_pressed());
   mtv->Reset();
 
   // Same thing with repeat and more than one key at once.
   PostKeyDown(ui::VKEY_0);
   PostKeyDown(ui::VKEY_1);
   PostKeyDown(ui::VKEY_1);
   PostKeyDown(ui::VKEY_0);
   PostKeyDown(ui::VKEY_0);
   PostKeyUp(ui::VKEY_1);
   PostKeyUp(ui::VKEY_0);
   MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
-  MessageLoopForUI::current()->Run(&accelerator_handler);
+  MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
   EXPECT_TRUE(mtv->keys_pressed().empty());
   EXPECT_TRUE(mtv->keys_released().empty());
   EXPECT_TRUE(mtv->accelerator_pressed());
   mtv->Reset();
 }
 #endif
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 // Test that the focus manager is created successfully for the first view
 // window parented to a native dialog.
@@ skipping 170 matching lines @@
   ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
 
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 
   // Clear window_ so that we don't try to close it again.
   window_ = NULL;
 }
 
 }  // namespace views