chrome/browser: Update calls from RunAllPending() to RunUntilIdle().

chrome/browser/net/http_server_properties_manager_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 "chrome/browser/net/http_server_properties_manager.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/common/pref_names.h"
@@ skipping 70 matching lines @@
   HttpServerPropertiesManagerTest()
       : ui_thread_(BrowserThread::UI, &loop_),
         io_thread_(BrowserThread::IO, &loop_) {
   }
 
   virtual void SetUp() OVERRIDE {
     pref_service_.RegisterDictionaryPref(prefs::kHttpServerProperties);
     http_server_props_manager_.reset(
         new StrictMock<TestingHttpServerPropertiesManager>(&pref_service_));
     ExpectCacheUpdate();
-    loop_.RunAllPending();
+    loop_.RunUntilIdle();
   }
 
   virtual void TearDown() OVERRIDE {
     if (http_server_props_manager_.get())
       http_server_props_manager_->ShutdownOnUIThread();
-    loop_.RunAllPending();
+    loop_.RunUntilIdle();
     // Delete |http_server_props_manager_| while |io_thread_| is mapping IO to
     // |loop_|.
     http_server_props_manager_.reset();
   }
 
   void ExpectCacheUpdate() {
     EXPECT_CALL(*http_server_props_manager_, UpdateCacheFromPrefsOnUI())
         .WillOnce(
             Invoke(http_server_props_manager_.get(),
                    &TestingHttpServerPropertiesManager::
@@ skipping 69 matching lines @@
       "mail.google.com:80", server_pref_dict1);
 
   // Set the same value for kHttpServerProperties multiple times.
   pref_service_.SetManagedPref(prefs::kHttpServerProperties,
                                http_server_properties_dict);
   base::DictionaryValue* http_server_properties_dict2 =
       http_server_properties_dict->DeepCopy();
   pref_service_.SetManagedPref(prefs::kHttpServerProperties,
                                http_server_properties_dict2);
 
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   // Verify SupportsSpdy.
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(
       net::HostPortPair::FromString("www.google.com:80")));
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(
       net::HostPortPair::FromString("mail.google.com:80")));
   EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(
       net::HostPortPair::FromString("foo.google.com:1337")));
 
@@ skipping 27 matching lines @@
 
   // Post an update task to the IO thread. SetSupportsSpdy calls
   // ScheduleUpdatePrefsOnIO.
 
   // Add mail.google.com:443 as a supporting spdy server.
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
   EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
 
   // Run the task.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, SetSpdySetting) {
   ExpectPrefsUpdate();
 
   // Add SpdySetting for mail.google.com:443.
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
   const net::SpdySettingsIds id1 = net::SETTINGS_UPLOAD_BANDWIDTH;
   const net::SpdySettingsFlags flags1 = net::SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32 value1 = 31337;
   http_server_props_manager_->SetSpdySetting(
       spdy_server_mail, id1, flags1, value1);
 
   // Run the task.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 
   const net::SettingsMap& settings_map1_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
   ASSERT_EQ(1U, settings_map1_ret.size());
   net::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
   EXPECT_TRUE(it1_ret != settings_map1_ret.end());
   net::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
   EXPECT_EQ(net::SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
   EXPECT_EQ(value1, flags_and_value1_ret.second);
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
   ExpectPrefsUpdate();
 
   net::HostPortPair spdy_server_mail("mail.google.com", 80);
   EXPECT_FALSE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
   http_server_props_manager_->SetAlternateProtocol(
       spdy_server_mail, 443, net::NPN_SPDY_2);
 
   // Run the task.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   ASSERT_TRUE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
   net::PortAlternateProtocolPair port_alternate_protocol =
       http_server_props_manager_->GetAlternateProtocol(spdy_server_mail);
   EXPECT_EQ(443, port_alternate_protocol.port);
   EXPECT_EQ(net::NPN_SPDY_2, port_alternate_protocol.protocol);
 }
 
 TEST_F(HttpServerPropertiesManagerTest, PipelineCapability) {
   ExpectPrefsUpdate();
 
   net::HostPortPair known_pipeliner("pipeline.com", 8080);
   net::HostPortPair bad_pipeliner("wordpress.com", 80);
   EXPECT_EQ(net::PIPELINE_UNKNOWN,
             http_server_props_manager_->GetPipelineCapability(known_pipeliner));
   EXPECT_EQ(net::PIPELINE_UNKNOWN,
             http_server_props_manager_->GetPipelineCapability(bad_pipeliner));
 
   // Post an update task to the IO thread. SetPipelineCapability calls
   // ScheduleUpdatePrefsOnIO.
   http_server_props_manager_->SetPipelineCapability(known_pipeliner,
                                                     net::PIPELINE_CAPABLE);
   http_server_props_manager_->SetPipelineCapability(bad_pipeliner,
                                                     net::PIPELINE_INCAPABLE);
 
   // Run the task.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 
   EXPECT_EQ(net::PIPELINE_CAPABLE,
             http_server_props_manager_->GetPipelineCapability(known_pipeliner));
   EXPECT_EQ(net::PIPELINE_INCAPABLE,
             http_server_props_manager_->GetPipelineCapability(bad_pipeliner));
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, Clear) {
   ExpectPrefsUpdate();
 
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
   http_server_props_manager_->SetAlternateProtocol(
       spdy_server_mail, 443, net::NPN_SPDY_2);
 
   const net::SpdySettingsIds id1 = net::SETTINGS_UPLOAD_BANDWIDTH;
   const net::SpdySettingsFlags flags1 = net::SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32 value1 = 31337;
   http_server_props_manager_->SetSpdySetting(
       spdy_server_mail, id1, flags1, value1);
 
   net::HostPortPair known_pipeliner("pipeline.com", 8080);
   http_server_props_manager_->SetPipelineCapability(known_pipeliner,
                                                     net::PIPELINE_CAPABLE);
 
   // Run the task.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
   EXPECT_TRUE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
 
   // Check SPDY settings values.
   const net::SettingsMap& settings_map1_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
   ASSERT_EQ(1U, settings_map1_ret.size());
   net::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
@@ skipping 27 matching lines @@
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache0) {
   // Post an update task to the UI thread.
   http_server_props_manager_->ScheduleUpdateCacheOnUI();
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnUIThread();
   http_server_props_manager_.reset();
   // Run the task after shutdown and deletion.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 }
 
 TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache1) {
   // Post an update task.
   http_server_props_manager_->ScheduleUpdateCacheOnUI();
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnUIThread();
   // Run the task after shutdown, but before deletion.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 }
 
 TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache2) {
   http_server_props_manager_->UpdateCacheFromPrefsOnUIConcrete();
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnUIThread();
   // Run the task after shutdown, but before deletion.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 }
 
 //
 // Tests for shutdown when updating prefs.
 //
 TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs0) {
   // Post an update task to the IO thread.
   http_server_props_manager_->ScheduleUpdatePrefsOnIO();
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnUIThread();
   http_server_props_manager_.reset();
   // Run the task after shutdown and deletion.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 }
 
 TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs1) {
   ExpectPrefsUpdate();
   // Post an update task.
   http_server_props_manager_->ScheduleUpdatePrefsOnIO();
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnUIThread();
   // Run the task after shutdown, but before deletion.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 }
 
 TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs2) {
   // This posts a task to the UI thread.
   http_server_props_manager_->UpdatePrefsFromCacheOnIOConcrete(base::Closure());
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnUIThread();
   // Run the task after shutdown, but before deletion.
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
-  loop_.RunAllPending();
+  loop_.RunUntilIdle();
 }
 
 }  // namespace
 
 }  // namespace chrome_browser_net