Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_server_properties_manager_unittest.cc

Issue 2894863002: Rename TaskRunner::RunsTasksOnCurrentThread() in //net (Closed)
Patch Set: fixed build error Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_server_properties_manager.cc ('k') | net/http/transport_security_persister.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_server_properties_manager_unittest.cc
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc
index c22ed26f0c4453a7c1d5b08944d33b24f51afd76..b10b3379edbd85b948d92e042e13282fb16e4a70 100644
--- a/net/http/http_server_properties_manager_unittest.cc
+++ b/net/http/http_server_properties_manager_unittest.cc
@@ -91,7 +91,7 @@ class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager {
net_task_runner_(std::move(net_task_runner)) {
// This call must run in the context of |net_task_runner_|.
TestMockTimeTaskRunner::ScopedContext scoped_context(net_task_runner_);
- HttpServerPropertiesManager::InitializeOnNetworkThread();
+ HttpServerPropertiesManager::InitializeOnNetworkSequence();
}
~TestingHttpServerPropertiesManager() override {}
@@ -101,31 +101,33 @@ class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager {
void UpdateCacheFromPrefsOnUIConcrete() {
TestMockTimeTaskRunner::ScopedContext scoped_context(pref_task_runner_);
- HttpServerPropertiesManager::UpdateCacheFromPrefsOnPrefThread();
+ HttpServerPropertiesManager::UpdateCacheFromPrefsOnPrefSequence();
}
- void UpdatePrefsFromCacheOnNetworkThreadConcrete(
+ void UpdatePrefsFromCacheOnNetworkSequenceConcrete(
const base::Closure& callback) {
TestMockTimeTaskRunner::ScopedContext scoped_context(net_task_runner_);
- HttpServerPropertiesManager::UpdatePrefsFromCacheOnNetworkThread(callback);
+ HttpServerPropertiesManager::UpdatePrefsFromCacheOnNetworkSequence(
+ callback);
}
- void ScheduleUpdatePrefsOnNetworkThreadConcrete(Location location) {
+ void ScheduleUpdatePrefsOnNetworkSequenceConcrete(Location location) {
TestMockTimeTaskRunner::ScopedContext scoped_context(net_task_runner_);
- HttpServerPropertiesManager::ScheduleUpdatePrefsOnNetworkThread(location);
+ HttpServerPropertiesManager::ScheduleUpdatePrefsOnNetworkSequence(location);
}
- void ScheduleUpdatePrefsOnNetworkThreadDefault() {
+ void ScheduleUpdatePrefsOnNetworkSequenceDefault() {
TestMockTimeTaskRunner::ScopedContext scoped_context(net_task_runner_);
// Picked a random Location as caller.
- HttpServerPropertiesManager::ScheduleUpdatePrefsOnNetworkThread(
+ HttpServerPropertiesManager::ScheduleUpdatePrefsOnNetworkSequence(
DETECTED_CORRUPTED_PREFS);
}
- MOCK_METHOD0(UpdateCacheFromPrefsOnPrefThread, void());
- MOCK_METHOD1(UpdatePrefsFromCacheOnNetworkThread, void(const base::Closure&));
- MOCK_METHOD1(ScheduleUpdatePrefsOnNetworkThread, void(Location location));
- MOCK_METHOD6(UpdateCacheFromPrefsOnNetworkThread,
+ MOCK_METHOD0(UpdateCacheFromPrefsOnPrefSequence, void());
+ MOCK_METHOD1(UpdatePrefsFromCacheOnNetworkSequence,
+ void(const base::Closure&));
+ MOCK_METHOD1(ScheduleUpdatePrefsOnNetworkSequence, void(Location location));
+ MOCK_METHOD6(UpdateCacheFromPrefsOnNetworkSequence,
void(std::vector<std::string>* spdy_servers,
AlternativeServiceMap* alternative_service_map,
IPAddress* last_quic_address,
@@ -179,7 +181,7 @@ class HttpServerPropertiesManagerTest : public testing::TestWithParam<int> {
void TearDown() override {
if (http_server_props_manager_.get())
- http_server_props_manager_->ShutdownOnPrefThread();
+ http_server_props_manager_->ShutdownOnPrefSequence();
// Run pending non-delayed tasks but don't FastForwardUntilNoTasksRemain()
// as some delayed tasks may forever repost (e.g. because impl doesn't use a
// mock clock and doesn't see timings as having expired, ref.
@@ -191,37 +193,39 @@ class HttpServerPropertiesManagerTest : public testing::TestWithParam<int> {
}
void ExpectCacheUpdate() {
- EXPECT_CALL(*http_server_props_manager_, UpdateCacheFromPrefsOnPrefThread())
+ EXPECT_CALL(*http_server_props_manager_,
+ UpdateCacheFromPrefsOnPrefSequence())
.WillOnce(Invoke(http_server_props_manager_.get(),
&TestingHttpServerPropertiesManager::
UpdateCacheFromPrefsOnUIConcrete));
}
- void ExpectScheduleUpdatePrefsOnNetworkThread() {
+ void ExpectScheduleUpdatePrefsOnNetworkSequence() {
EXPECT_CALL(*http_server_props_manager_,
- ScheduleUpdatePrefsOnNetworkThread(_))
+ ScheduleUpdatePrefsOnNetworkSequence(_))
.WillOnce(Invoke(http_server_props_manager_.get(),
&TestingHttpServerPropertiesManager::
- ScheduleUpdatePrefsOnNetworkThreadConcrete));
+ ScheduleUpdatePrefsOnNetworkSequenceConcrete));
}
- void ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly(int times) {
+ void ExpectScheduleUpdatePrefsOnNetworkSequenceRepeatedly(int times) {
EXPECT_CALL(*http_server_props_manager_,
- ScheduleUpdatePrefsOnNetworkThread(_))
+ ScheduleUpdatePrefsOnNetworkSequence(_))
.Times(AtLeast(times))
- .WillRepeatedly(Invoke(http_server_props_manager_.get(),
- &TestingHttpServerPropertiesManager::
- ScheduleUpdatePrefsOnNetworkThreadConcrete));
+ .WillRepeatedly(
+ Invoke(http_server_props_manager_.get(),
+ &TestingHttpServerPropertiesManager::
+ ScheduleUpdatePrefsOnNetworkSequenceConcrete));
}
void ExpectPrefsUpdate(int times) {
EXPECT_CALL(*http_server_props_manager_,
- UpdatePrefsFromCacheOnNetworkThread(_))
+ UpdatePrefsFromCacheOnNetworkSequence(_))
.Times(times)
.WillRepeatedly(
Invoke(http_server_props_manager_.get(),
&TestingHttpServerPropertiesManager::
- UpdatePrefsFromCacheOnNetworkThreadConcrete));
+ UpdatePrefsFromCacheOnNetworkSequenceConcrete));
}
bool HasAlternativeService(const url::SchemeHostPort& server) {
@@ -478,7 +482,7 @@ TEST_P(HttpServerPropertiesManagerTest, BadCachedHostPortPair) {
ExpectCacheUpdate();
// The prefs are automatically updated in the case corruption is detected.
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
auto server_pref_dict = base::MakeUnique<base::DictionaryValue>();
@@ -567,7 +571,7 @@ TEST_P(HttpServerPropertiesManagerTest, BadCachedAltProtocolPort) {
ExpectCacheUpdate();
// The prefs are automatically updated in the case corruption is detected.
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
auto server_pref_dict = base::MakeUnique<base::DictionaryValue>();
@@ -628,17 +632,17 @@ TEST_P(HttpServerPropertiesManagerTest, BadCachedAltProtocolPort) {
TEST_P(HttpServerPropertiesManagerTest, SupportsSpdy) {
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
// Post an update task to the network thread. SetSupportsSpdy calls
- // ScheduleUpdatePrefsOnNetworkThread.
+ // ScheduleUpdatePrefsOnNetworkSequence.
// Add mail.google.com:443 as a supporting spdy server.
url::SchemeHostPort spdy_server("https", "mail.google.com", 443);
EXPECT_FALSE(
http_server_props_manager_->SupportsRequestPriority(spdy_server));
http_server_props_manager_->SetSupportsSpdy(spdy_server, true);
- // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
+ // ExpectScheduleUpdatePrefsOnNetworkSequence() should be called only once.
http_server_props_manager_->SetSupportsSpdy(spdy_server, true);
// Run the task.
@@ -661,10 +665,10 @@ TEST_P(HttpServerPropertiesManagerTest, SupportsSpdy) {
TEST_P(HttpServerPropertiesManagerTest,
SinglePrefUpdateForTwoSpdyServerCacheChanges) {
ExpectPrefsUpdate(2);
- ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly(3);
+ ExpectScheduleUpdatePrefsOnNetworkSequenceRepeatedly(3);
// Post an update task to the network thread. SetSupportsSpdy calls
- // ScheduleUpdatePrefsOnNetworkThread with a delay of 60ms.
+ // ScheduleUpdatePrefsOnNetworkSequence with a delay of 60ms.
url::SchemeHostPort spdy_server("https", "mail.google.com", 443);
EXPECT_FALSE(
http_server_props_manager_->SupportsRequestPriority(spdy_server));
@@ -678,8 +682,8 @@ TEST_P(HttpServerPropertiesManagerTest,
base::TimeDelta::FromMilliseconds(20));
// Set another spdy server to trigger another call to
- // ScheduleUpdatePrefsOnNetworkThread. There should be no new update posted to
- // the network thread.
+ // ScheduleUpdatePrefsOnNetworkSequence. There should be no new update posted
+ // to the network thread.
url::SchemeHostPort spdy_server2("https", "drive.google.com", 443);
http_server_props_manager_->SetSupportsSpdy(spdy_server2, true);
EXPECT_EQ(1u, net_test_task_runner_->GetPendingTaskCount());
@@ -697,7 +701,7 @@ TEST_P(HttpServerPropertiesManagerTest,
EXPECT_TRUE(
http_server_props_manager_->SupportsRequestPriority(spdy_server2));
// Set the third spdy server to trigger one more call to
- // ScheduleUpdatePrefsOnNetworkThread. A new update task should be posted to
+ // ScheduleUpdatePrefsOnNetworkSequence. A new update task should be posted to
// network thread now since the previous one is completed.
url::SchemeHostPort spdy_server3("https", "maps.google.com", 443);
http_server_props_manager_->SetSupportsSpdy(spdy_server3, true);
@@ -718,7 +722,7 @@ TEST_P(HttpServerPropertiesManagerTest,
TEST_P(HttpServerPropertiesManagerTest, GetAlternativeServiceInfos) {
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
url::SchemeHostPort spdy_server_mail("http", "mail.google.com", 80);
EXPECT_FALSE(HasAlternativeService(spdy_server_mail));
@@ -726,7 +730,7 @@ TEST_P(HttpServerPropertiesManagerTest, GetAlternativeServiceInfos) {
443);
http_server_props_manager_->SetAlternativeService(
spdy_server_mail, alternative_service, one_day_from_now_);
- // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
+ // ExpectScheduleUpdatePrefsOnNetworkSequence() should be called only once.
http_server_props_manager_->SetAlternativeService(
spdy_server_mail, alternative_service, one_day_from_now_);
@@ -750,7 +754,7 @@ TEST_P(HttpServerPropertiesManagerTest, GetAlternativeServiceInfos) {
TEST_P(HttpServerPropertiesManagerTest, SetAlternativeServices) {
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
url::SchemeHostPort spdy_server_mail("http", "mail.google.com", 80);
EXPECT_FALSE(HasAlternativeService(spdy_server_mail));
@@ -765,7 +769,7 @@ TEST_P(HttpServerPropertiesManagerTest, SetAlternativeServices) {
AlternativeServiceInfo(alternative_service2, one_day_from_now_));
http_server_props_manager_->SetAlternativeServices(
spdy_server_mail, alternative_service_info_vector);
- // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
+ // ExpectScheduleUpdatePrefsOnNetworkSequence() should be called only once.
http_server_props_manager_->SetAlternativeServices(
spdy_server_mail, alternative_service_info_vector);
@@ -797,7 +801,7 @@ TEST_P(HttpServerPropertiesManagerTest, SetAlternativeServicesEmpty) {
http_server_props_manager_->SetAlternativeServices(
spdy_server_mail, AlternativeServiceInfoVector());
- // ExpectScheduleUpdatePrefsOnNetworkThread() should not be called.
+ // ExpectScheduleUpdatePrefsOnNetworkSequence() should not be called.
EXPECT_FALSE(pref_test_task_runner_->HasPendingTask());
EXPECT_FALSE(net_test_task_runner_->HasPendingTask());
Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
@@ -819,7 +823,7 @@ TEST_P(HttpServerPropertiesManagerTest, ConfirmAlternativeService) {
alternative_service =
AlternativeService(kProtoHTTP2, "mail.google.com", 443);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
http_server_props_manager_->SetAlternativeService(
spdy_server_mail, alternative_service, one_day_from_now_);
@@ -829,7 +833,7 @@ TEST_P(HttpServerPropertiesManagerTest, ConfirmAlternativeService) {
http_server_props_manager_->WasAlternativeServiceRecentlyBroken(
alternative_service));
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
http_server_props_manager_->MarkAlternativeServiceBroken(
alternative_service);
EXPECT_TRUE(http_server_props_manager_->IsAlternativeServiceBroken(
@@ -837,14 +841,14 @@ TEST_P(HttpServerPropertiesManagerTest, ConfirmAlternativeService) {
EXPECT_TRUE(http_server_props_manager_->WasAlternativeServiceRecentlyBroken(
alternative_service));
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
http_server_props_manager_->ConfirmAlternativeService(alternative_service);
EXPECT_FALSE(http_server_props_manager_->IsAlternativeServiceBroken(
alternative_service));
EXPECT_FALSE(
http_server_props_manager_->WasAlternativeServiceRecentlyBroken(
alternative_service));
- // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
+ // ExpectScheduleUpdatePrefsOnNetworkSequence() should be called only once.
http_server_props_manager_->ConfirmAlternativeService(alternative_service);
EXPECT_FALSE(http_server_props_manager_->IsAlternativeServiceBroken(
alternative_service));
@@ -876,14 +880,14 @@ TEST_P(HttpServerPropertiesManagerTest, ConfirmAlternativeService) {
TEST_P(HttpServerPropertiesManagerTest, SupportsQuic) {
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
IPAddress address;
EXPECT_FALSE(http_server_props_manager_->GetSupportsQuic(&address));
IPAddress actual_address(127, 0, 0, 1);
http_server_props_manager_->SetSupportsQuic(true, actual_address);
- // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
+ // ExpectScheduleUpdatePrefsOnNetworkSequence() should be called only once.
http_server_props_manager_->SetSupportsQuic(true, actual_address);
// Run the task.
@@ -903,7 +907,7 @@ TEST_P(HttpServerPropertiesManagerTest, SupportsQuic) {
TEST_P(HttpServerPropertiesManagerTest, ServerNetworkStats) {
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
url::SchemeHostPort mail_server("http", "mail.google.com", 80);
const ServerNetworkStats* stats =
@@ -912,7 +916,7 @@ TEST_P(HttpServerPropertiesManagerTest, ServerNetworkStats) {
ServerNetworkStats stats1;
stats1.srtt = base::TimeDelta::FromMicroseconds(10);
http_server_props_manager_->SetServerNetworkStats(mail_server, stats1);
- // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
+ // ExpectScheduleUpdatePrefsOnNetworkSequence() should be called only once.
http_server_props_manager_->SetServerNetworkStats(mail_server, stats1);
// Run the task.
@@ -931,7 +935,7 @@ TEST_P(HttpServerPropertiesManagerTest, ServerNetworkStats) {
EXPECT_EQ(10, stats2->srtt.ToInternalValue());
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
http_server_props_manager_->ClearServerNetworkStats(mail_server);
@@ -951,7 +955,7 @@ TEST_P(HttpServerPropertiesManagerTest, ServerNetworkStats) {
TEST_P(HttpServerPropertiesManagerTest, QuicServerInfo) {
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThread();
+ ExpectScheduleUpdatePrefsOnNetworkSequence();
QuicServerId mail_quic_server_id("mail.google.com", 80);
EXPECT_EQ(nullptr,
@@ -959,7 +963,7 @@ TEST_P(HttpServerPropertiesManagerTest, QuicServerInfo) {
std::string quic_server_info1("quic_server_info1");
http_server_props_manager_->SetQuicServerInfo(mail_quic_server_id,
quic_server_info1);
- // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
+ // ExpectScheduleUpdatePrefsOnNetworkSequence() should be called only once.
http_server_props_manager_->SetQuicServerInfo(mail_quic_server_id,
quic_server_info1);
@@ -980,7 +984,7 @@ TEST_P(HttpServerPropertiesManagerTest, QuicServerInfo) {
TEST_P(HttpServerPropertiesManagerTest, Clear) {
ExpectPrefsUpdate(1);
- ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly(5);
+ ExpectScheduleUpdatePrefsOnNetworkSequenceRepeatedly(5);
const url::SchemeHostPort spdy_server("https", "mail.google.com", 443);
const IPAddress actual_address(127, 0, 0, 1);
@@ -1153,7 +1157,7 @@ TEST_P(HttpServerPropertiesManagerTest, BadSupportsQuic) {
}
TEST_P(HttpServerPropertiesManagerTest, UpdatePrefsWithCache) {
- ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly(5);
+ ExpectScheduleUpdatePrefsOnNetworkSequenceRepeatedly(5);
const url::SchemeHostPort server_www("https", "www.google.com", 80);
const url::SchemeHostPort server_mail("https", "mail.google.com", 80);
@@ -1338,7 +1342,7 @@ TEST_P(HttpServerPropertiesManagerTest, DoNotLoadAltSvcForInsecureOrigins) {
// Do not persist expired or broken alternative service entries to disk.
TEST_P(HttpServerPropertiesManagerTest,
DoNotPersistExpiredOrBrokenAlternativeService) {
- ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly(2);
+ ExpectScheduleUpdatePrefsOnNetworkSequenceRepeatedly(2);
{
TestMockTimeTaskRunner::ScopedContext scoped_context(net_test_task_runner_);
@@ -1466,7 +1470,7 @@ TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache0) {
// Post an update task to the UI thread.
http_server_props_manager_->ScheduleUpdateCacheOnPrefThread();
// Shutdown comes before the task is executed.
- http_server_props_manager_->ShutdownOnPrefThread();
+ http_server_props_manager_->ShutdownOnPrefSequence();
http_server_props_manager_.reset();
// Run the task after shutdown and deletion.
EXPECT_FALSE(net_test_task_runner_->HasPendingTask());
@@ -1480,7 +1484,7 @@ TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache1) {
// Post an update task.
http_server_props_manager_->ScheduleUpdateCacheOnPrefThread();
// Shutdown comes before the task is executed.
- http_server_props_manager_->ShutdownOnPrefThread();
+ http_server_props_manager_->ShutdownOnPrefSequence();
// Run the task after shutdown, but before deletion.
EXPECT_FALSE(net_test_task_runner_->HasPendingTask());
EXPECT_TRUE(pref_test_task_runner_->HasPendingTask());
@@ -1497,7 +1501,7 @@ TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache1) {
TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache2) {
http_server_props_manager_->UpdateCacheFromPrefsOnUIConcrete();
// Shutdown comes before the task is executed.
- http_server_props_manager_->ShutdownOnPrefThread();
+ http_server_props_manager_->ShutdownOnPrefSequence();
// There should be no tasks to run.
EXPECT_FALSE(net_test_task_runner_->HasPendingTask());
EXPECT_FALSE(pref_test_task_runner_->HasPendingTask());
@@ -1512,9 +1516,9 @@ TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache2) {
//
TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs0) {
// Post an update task to the IO thread.
- http_server_props_manager_->ScheduleUpdatePrefsOnNetworkThreadDefault();
+ http_server_props_manager_->ScheduleUpdatePrefsOnNetworkSequenceDefault();
// Shutdown comes before the task is executed.
- http_server_props_manager_->ShutdownOnPrefThread();
+ http_server_props_manager_->ShutdownOnPrefSequence();
http_server_props_manager_.reset();
// Run the task after shutdown and deletion.
EXPECT_TRUE(net_test_task_runner_->HasPendingTask());
@@ -1527,9 +1531,9 @@ TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs0) {
TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs1) {
ExpectPrefsUpdate(1);
// Post an update task.
- http_server_props_manager_->ScheduleUpdatePrefsOnNetworkThreadDefault();
+ http_server_props_manager_->ScheduleUpdatePrefsOnNetworkSequenceDefault();
// Shutdown comes before the task is executed.
- http_server_props_manager_->ShutdownOnPrefThread();
+ http_server_props_manager_->ShutdownOnPrefSequence();
// Run the task after shutdown, but before deletion.
EXPECT_TRUE(net_test_task_runner_->HasPendingTask());
EXPECT_FALSE(pref_test_task_runner_->HasPendingTask());
@@ -1547,10 +1551,10 @@ TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs1) {
TEST_P(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs2) {
// This posts a task to the UI thread.
- http_server_props_manager_->UpdatePrefsFromCacheOnNetworkThreadConcrete(
+ http_server_props_manager_->UpdatePrefsFromCacheOnNetworkSequenceConcrete(
base::Closure());
// Shutdown comes before the task is executed.
- http_server_props_manager_->ShutdownOnPrefThread();
+ http_server_props_manager_->ShutdownOnPrefSequence();
// Run the task after shutdown, but before deletion.
EXPECT_FALSE(net_test_task_runner_->HasPendingTask());
EXPECT_TRUE(pref_test_task_runner_->HasPendingTask());
« no previous file with comments | « net/http/http_server_properties_manager.cc ('k') | net/http/transport_security_persister.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698