RunAllPendingEvents -> ui_test_utils::RunAllPendingInMessageLoop

chrome/browser/chromeos/login/network_screen_browsertest.cc

 // Copyright (c) 2010 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 "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mock_login_library.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/network_selection_view.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/mock_screen_observer.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/wizard_screen.h"
+#include "chrome/test/ui_test_utils.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "views/controls/combobox/combobox.h"
 
 namespace chromeos {
 using ::testing::AnyNumber;
 using ::testing::InvokeWithoutArgs;
 using ::testing::Return;
 using ::testing::ReturnRef;
@@ skipping 200 matching lines @@
   EXPECT_CALL(*mock_screen_observer,
               OnExit(ScreenObserver::NETWORK_CONNECTED))
       .Times(1);
   controller()->set_observer(mock_screen_observer.get());
 
   // Emulate combobox selection.
   EthernetExpectations(true, false);
   WifiCellularNetworksExpectations();
   network_screen->ItemChanged(&combobox, 0, 1);
   network_view->SetSelectedNetworkItem(1);
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   controller()->set_observer(NULL);
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, WifiSelected) {
   ASSERT_TRUE(controller());
   NetworkLibrary* network_library =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   NetworkScreen* network_screen = controller()->GetNetworkScreen();
   ASSERT_TRUE(network_screen != NULL);
   NetworkSelectionView* network_view = network_screen->view();
@@ skipping 16 matching lines @@
 
   // Emulate combobox selection.
   EthernetExpectations(false, false);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(empty_string);
   network_screen->ItemChanged(&combobox, 0, 1);
   network_view->SetSelectedNetworkItem(1);
   EXPECT_CALL(*mock_network_library_,
               ConnectToWifiNetwork(A<WifiNetwork>(), string16()))
       .Times(1);
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   ASSERT_EQ(2, network_screen->GetItemCount());
 
   // Emulate  connecting WiFi network.
   wifi_networks_.clear();
   wifi.connecting = true;
   wifi_networks_.push_back(wifi);
   EthernetExpectations(false, false);
   WifiExpectations(false, true);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(wifi_ssid);
   network_screen->NetworkChanged(network_library);
   ASSERT_EQ(network_screen, controller()->current_screen());
 
   scoped_ptr<MockScreenObserver> mock_screen_observer(new MockScreenObserver());
   EXPECT_CALL(*mock_screen_observer,
               OnExit(ScreenObserver::NETWORK_CONNECTED))
       .Times(1);
   controller()->set_observer(mock_screen_observer.get());
 
   // Emulate connected WiFi network.
   wifi_networks_.clear();
   wifi.connecting = false;
   wifi.connected = true;
   wifi_networks_.push_back(wifi);
   EthernetExpectations(false, false);
   WifiExpectations(true, false);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(wifi_ssid);
   network_screen->NetworkChanged(network_library);
-  RunAllPendingEvents();
+  ui_test_utils::RunAllPendingInMessageLoop();
   controller()->set_observer(NULL);
 }
 
 }  // namespace chromeos