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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_server_properties_manager.cc

Issue 2894863002: Rename TaskRunner::RunsTasksOnCurrentThread() in //net (Closed)
Patch Set: for Requirements 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
« net/cert_net/cert_net_fetcher_impl.cc ('K') | « net/extras/sqlite/sqlite_persistent_cookie_store.cc ('k') | net/http/transport_security_persister.cc » ('j') | net/nqe/network_qualities_prefs_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_server_properties_manager.cc
diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc
index f927874e489ab48d7fde1305362de816c20491b0..0c92ebf47b79e5ff261f6eedfa28234e3ab216d3 100644
--- a/net/http/http_server_properties_manager.cc
+++ b/net/http/http_server_properties_manager.cc
@@ -81,7 +81,7 @@ HttpServerPropertiesManager::HttpServerPropertiesManager(
setting_prefs_(false),
is_initialized_(false),
network_task_runner_(std::move(network_task_runner)) {
- DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
DCHECK(pref_delegate_);
pref_weak_ptr_factory_.reset(
new base::WeakPtrFactory<HttpServerPropertiesManager>(this));
@@ -94,12 +94,12 @@ HttpServerPropertiesManager::HttpServerPropertiesManager(
}
HttpServerPropertiesManager::~HttpServerPropertiesManager() {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
network_weak_ptr_factory_.reset();
}
void HttpServerPropertiesManager::InitializeOnNetworkThread() {
Ryan Sleevi 2017/05/22 17:22:13 OnNetworkSequence?
Yeol Park 2017/05/23 05:26:33 Done.
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
network_weak_ptr_factory_.reset(
new base::WeakPtrFactory<HttpServerPropertiesManager>(this));
@@ -119,7 +119,7 @@ void HttpServerPropertiesManager::InitializeOnNetworkThread() {
}
void HttpServerPropertiesManager::ShutdownOnPrefThread() {
Ryan Sleevi 2017/05/22 17:22:13 OnPrefSequence?
Yeol Park 2017/05/23 05:26:33 Done.
- DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
// Cancel any pending updates, and stop listening for pref change updates.
pref_cache_update_timer_->Stop();
pref_weak_ptr_factory_.reset();
@@ -142,7 +142,7 @@ void HttpServerPropertiesManager::Clear() {
}
void HttpServerPropertiesManager::Clear(const base::Closure& completion) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
http_server_properties_impl_->Clear();
UpdatePrefsFromCacheOnNetworkThread(completion);
@@ -150,20 +150,20 @@ void HttpServerPropertiesManager::Clear(const base::Closure& completion) {
bool HttpServerPropertiesManager::SupportsRequestPriority(
const url::SchemeHostPort& server) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->SupportsRequestPriority(server);
}
bool HttpServerPropertiesManager::GetSupportsSpdy(
const url::SchemeHostPort& server) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->GetSupportsSpdy(server);
}
void HttpServerPropertiesManager::SetSupportsSpdy(
const url::SchemeHostPort& server,
bool support_spdy) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
bool old_support_spdy = http_server_properties_impl_->GetSupportsSpdy(server);
http_server_properties_impl_->SetSupportsSpdy(server, support_spdy);
@@ -173,13 +173,13 @@ void HttpServerPropertiesManager::SetSupportsSpdy(
}
bool HttpServerPropertiesManager::RequiresHTTP11(const HostPortPair& server) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->RequiresHTTP11(server);
}
void HttpServerPropertiesManager::SetHTTP11Required(
const HostPortPair& server) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
http_server_properties_impl_->SetHTTP11Required(server);
ScheduleUpdatePrefsOnNetworkThread(HTTP_11_REQUIRED);
@@ -187,13 +187,13 @@ void HttpServerPropertiesManager::SetHTTP11Required(
void HttpServerPropertiesManager::MaybeForceHTTP11(const HostPortPair& server,
SSLConfig* ssl_config) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
http_server_properties_impl_->MaybeForceHTTP11(server, ssl_config);
}
AlternativeServiceVector HttpServerPropertiesManager::GetAlternativeServices(
const url::SchemeHostPort& origin) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->GetAlternativeServices(origin);
}
@@ -201,7 +201,7 @@ bool HttpServerPropertiesManager::SetAlternativeService(
const url::SchemeHostPort& origin,
const AlternativeService& alternative_service,
base::Time expiration) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
const bool changed = http_server_properties_impl_->SetAlternativeService(
origin, alternative_service, expiration);
if (changed) {
@@ -213,7 +213,7 @@ bool HttpServerPropertiesManager::SetAlternativeService(
bool HttpServerPropertiesManager::SetAlternativeServices(
const url::SchemeHostPort& origin,
const AlternativeServiceInfoVector& alternative_service_info_vector) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
const bool changed = http_server_properties_impl_->SetAlternativeServices(
origin, alternative_service_info_vector);
if (changed) {
@@ -224,7 +224,7 @@ bool HttpServerPropertiesManager::SetAlternativeServices(
void HttpServerPropertiesManager::MarkAlternativeServiceBroken(
const AlternativeService& alternative_service) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
http_server_properties_impl_->MarkAlternativeServiceBroken(
alternative_service);
ScheduleUpdatePrefsOnNetworkThread(MARK_ALTERNATIVE_SERVICE_BROKEN);
@@ -232,7 +232,7 @@ void HttpServerPropertiesManager::MarkAlternativeServiceBroken(
void HttpServerPropertiesManager::MarkAlternativeServiceRecentlyBroken(
const AlternativeService& alternative_service) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
http_server_properties_impl_->MarkAlternativeServiceRecentlyBroken(
alternative_service);
ScheduleUpdatePrefsOnNetworkThread(MARK_ALTERNATIVE_SERVICE_RECENTLY_BROKEN);
@@ -240,21 +240,21 @@ void HttpServerPropertiesManager::MarkAlternativeServiceRecentlyBroken(
bool HttpServerPropertiesManager::IsAlternativeServiceBroken(
const AlternativeService& alternative_service) const {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->IsAlternativeServiceBroken(
alternative_service);
}
bool HttpServerPropertiesManager::WasAlternativeServiceRecentlyBroken(
const AlternativeService& alternative_service) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->WasAlternativeServiceRecentlyBroken(
alternative_service);
}
void HttpServerPropertiesManager::ConfirmAlternativeService(
const AlternativeService& alternative_service) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
bool old_value = http_server_properties_impl_->IsAlternativeServiceBroken(
alternative_service);
http_server_properties_impl_->ConfirmAlternativeService(alternative_service);
@@ -268,25 +268,25 @@ void HttpServerPropertiesManager::ConfirmAlternativeService(
const AlternativeServiceMap&
HttpServerPropertiesManager::alternative_service_map() const {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->alternative_service_map();
}
std::unique_ptr<base::Value>
HttpServerPropertiesManager::GetAlternativeServiceInfoAsValue() const {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->GetAlternativeServiceInfoAsValue();
}
bool HttpServerPropertiesManager::GetSupportsQuic(
IPAddress* last_address) const {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->GetSupportsQuic(last_address);
}
void HttpServerPropertiesManager::SetSupportsQuic(bool used_quic,
const IPAddress& address) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
IPAddress old_last_quic_addr;
http_server_properties_impl_->GetSupportsQuic(&old_last_quic_addr);
http_server_properties_impl_->SetSupportsQuic(used_quic, address);
@@ -299,7 +299,7 @@ void HttpServerPropertiesManager::SetSupportsQuic(bool used_quic,
void HttpServerPropertiesManager::SetServerNetworkStats(
const url::SchemeHostPort& server,
ServerNetworkStats stats) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
ServerNetworkStats old_stats;
const ServerNetworkStats* old_stats_ptr =
http_server_properties_impl_->GetServerNetworkStats(server);
@@ -314,7 +314,7 @@ void HttpServerPropertiesManager::SetServerNetworkStats(
void HttpServerPropertiesManager::ClearServerNetworkStats(
const url::SchemeHostPort& server) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
bool need_update =
http_server_properties_impl_->GetServerNetworkStats(server) != nullptr;
http_server_properties_impl_->ClearServerNetworkStats(server);
@@ -324,20 +324,20 @@ void HttpServerPropertiesManager::ClearServerNetworkStats(
const ServerNetworkStats* HttpServerPropertiesManager::GetServerNetworkStats(
const url::SchemeHostPort& server) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->GetServerNetworkStats(server);
}
const ServerNetworkStatsMap&
HttpServerPropertiesManager::server_network_stats_map() const {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->server_network_stats_map();
}
bool HttpServerPropertiesManager::SetQuicServerInfo(
const QuicServerId& server_id,
const std::string& server_info) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
bool changed =
http_server_properties_impl_->SetQuicServerInfo(server_id, server_info);
if (changed)
@@ -347,32 +347,32 @@ bool HttpServerPropertiesManager::SetQuicServerInfo(
const std::string* HttpServerPropertiesManager::GetQuicServerInfo(
const QuicServerId& server_id) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->GetQuicServerInfo(server_id);
}
const QuicServerInfoMap& HttpServerPropertiesManager::quic_server_info_map()
const {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->quic_server_info_map();
}
size_t HttpServerPropertiesManager::max_server_configs_stored_in_properties()
const {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_
->max_server_configs_stored_in_properties();
}
void HttpServerPropertiesManager::SetMaxServerConfigsStoredInProperties(
size_t max_server_configs_stored_in_properties) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return http_server_properties_impl_->SetMaxServerConfigsStoredInProperties(
max_server_configs_stored_in_properties);
}
bool HttpServerPropertiesManager::IsInitialized() const {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
return is_initialized_;
}
@@ -391,7 +391,7 @@ base::TimeDelta HttpServerPropertiesManager::GetUpdatePrefsDelayForTesting() {
// Update the HttpServerPropertiesImpl's cache with data from preferences.
//
void HttpServerPropertiesManager::ScheduleUpdateCacheOnPrefThread() {
Ryan Sleevi 2017/05/22 17:22:13 OnPrefSequence
Yeol Park 2017/05/23 05:26:33 Done.
- DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
// Do not schedule a new update if there is already one scheduled.
if (pref_cache_update_timer_->IsRunning())
return;
@@ -403,7 +403,7 @@ void HttpServerPropertiesManager::ScheduleUpdateCacheOnPrefThread() {
void HttpServerPropertiesManager::UpdateCacheFromPrefsOnPrefThread() {
Ryan Sleevi 2017/05/22 17:22:13 OnPrefSequence
Yeol Park 2017/05/23 05:26:33 Done.
// The preferences can only be read on the pref thread.
- DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
if (!pref_delegate_->HasServerProperties())
return;
@@ -780,7 +780,7 @@ void HttpServerPropertiesManager::UpdateCacheFromPrefsOnNetworkThread(
bool detected_corrupted_prefs) {
// Preferences have the master data because admins might have pushed new
// preferences. Update the cached data with new data from preferences.
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
UMA_HISTOGRAM_COUNTS("Net.CountOfSpdyServers", spdy_servers->size());
http_server_properties_impl_->SetSpdyServers(spdy_servers, true);
@@ -811,7 +811,7 @@ void HttpServerPropertiesManager::UpdateCacheFromPrefsOnNetworkThread(
//
void HttpServerPropertiesManager::ScheduleUpdatePrefsOnNetworkThread(
Ryan Sleevi 2017/05/22 17:22:13 OnNetworkSequence
Yeol Park 2017/05/23 05:27:22 Done.
Location location) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
// Do not schedule a new update if there is already one scheduled.
if (network_prefs_update_timer_->IsRunning())
return;
@@ -832,7 +832,7 @@ void HttpServerPropertiesManager::UpdatePrefsFromCacheOnNetworkThread() {
void HttpServerPropertiesManager::UpdatePrefsFromCacheOnNetworkThread(
Ryan Sleevi 2017/05/22 17:22:14 OnNetworkSequence
Yeol Park 2017/05/23 05:26:33 Done.
const base::Closure& completion) {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
// It is in MRU order.
base::ListValue* spdy_server_list = new base::ListValue;
@@ -963,7 +963,7 @@ void HttpServerPropertiesManager::UpdatePrefsOnPrefThread(
typedef base::MRUCache<url::SchemeHostPort, ServerPref> ServerPrefMap;
ServerPrefMap server_pref_map(ServerPrefMap::NO_AUTO_EVICT);
- DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
// Add servers that support spdy to server_pref_map in the MRU order.
for (size_t index = spdy_server_list->GetSize(); index > 0; --index) {
@@ -1142,13 +1142,13 @@ void HttpServerPropertiesManager::SaveQuicServerInfoMapToServerPrefs(
}
void HttpServerPropertiesManager::OnHttpServerPropertiesChanged() {
- DCHECK(pref_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(pref_task_runner_->RunsTasksInCurrentSequence());
if (!setting_prefs_)
ScheduleUpdateCacheOnPrefThread();
}
void HttpServerPropertiesManager::SetInitialized() {
- DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
+ DCHECK(network_task_runner_->RunsTasksInCurrentSequence());
is_initialized_ = true;
}
« net/cert_net/cert_net_fetcher_impl.cc ('K') | « net/extras/sqlite/sqlite_persistent_cookie_store.cc ('k') | net/http/transport_security_persister.cc » ('j') | net/nqe/network_qualities_prefs_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698