diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-12 14:07:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 10:29:26 +0000 |
| commit | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (patch) | |
| tree | 25cde714b2b71eb639d1cd53f5a22e9ba76e14ef /chromium/net/http/http_server_properties_manager_unittest.cc | |
| parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
| download | qtwebengine-chromium-ec02ee4181c49b61fce1c8fb99292dbb8139cc90.tar.gz | |
BASELINE: Update Chromium to 59.0.3071.134
Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/net/http/http_server_properties_manager_unittest.cc')
| -rw-r--r-- | chromium/net/http/http_server_properties_manager_unittest.cc | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/chromium/net/http/http_server_properties_manager_unittest.cc b/chromium/net/http/http_server_properties_manager_unittest.cc index 35da22f80a6..7ab1f662a68 100644 --- a/chromium/net/http/http_server_properties_manager_unittest.cc +++ b/chromium/net/http/http_server_properties_manager_unittest.cc @@ -929,6 +929,24 @@ TEST_P(HttpServerPropertiesManagerTest, ServerNetworkStats) { const ServerNetworkStats* stats2 = http_server_props_manager_->GetServerNetworkStats(mail_server); EXPECT_EQ(10, stats2->srtt.ToInternalValue()); + + ExpectPrefsUpdate(1); + ExpectScheduleUpdatePrefsOnNetworkThread(); + + http_server_props_manager_->ClearServerNetworkStats(mail_server); + + // Run the task. + EXPECT_FALSE(pref_test_task_runner_->HasPendingTask()); + EXPECT_TRUE(net_test_task_runner_->HasPendingTask()); + net_test_task_runner_->FastForwardUntilNoTasksRemain(); + EXPECT_TRUE(pref_test_task_runner_->HasPendingTask()); + pref_test_task_runner_->FastForwardUntilNoTasksRemain(); + EXPECT_FALSE(net_test_task_runner_->HasPendingTask()); + EXPECT_FALSE(pref_test_task_runner_->HasPendingTask()); + + Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); + EXPECT_EQ(nullptr, + http_server_props_manager_->GetServerNetworkStats(mail_server)); } TEST_P(HttpServerPropertiesManagerTest, QuicServerInfo) { @@ -1380,7 +1398,7 @@ TEST_P(HttpServerPropertiesManagerTest, ASSERT_TRUE(pref_dict.GetListWithoutPathExpansion("servers", &servers_list)); base::ListValue::const_iterator it = servers_list->begin(); const base::DictionaryValue* server_pref_dict; - ASSERT_TRUE((*it)->GetAsDictionary(&server_pref_dict)); + ASSERT_TRUE(it->GetAsDictionary(&server_pref_dict)); const base::DictionaryValue* example_pref_dict; |