Commit 5d7e51aa authored by Sorin Jianu's avatar Sorin Jianu Committed by Commit Bot

Replace thread checkers with sequence checkers in updater/win/net.

Change-Id: I67566752373601fae9a667811be0d6ea146f2858
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276683Reviewed-by: default avatarS. Ganesh <ganesh@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784285}
parent 0683b8c7
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <memory> #include <memory>
#include "base/threading/thread_checker.h" #include "base/sequence_checker.h"
#include "chrome/updater/win/net/scoped_hinternet.h" #include "chrome/updater/win/net/scoped_hinternet.h"
#include "components/update_client/network.h" #include "components/update_client/network.h"
...@@ -28,7 +28,7 @@ class NetworkFetcherFactory : public update_client::NetworkFetcherFactory { ...@@ -28,7 +28,7 @@ class NetworkFetcherFactory : public update_client::NetworkFetcherFactory {
private: private:
static scoped_hinternet CreateSessionHandle(); static scoped_hinternet CreateSessionHandle();
THREAD_CHECKER(thread_checker_); SEQUENCE_CHECKER(sequence_checker_);
scoped_hinternet session_handle_; scoped_hinternet session_handle_;
}; };
......
...@@ -36,7 +36,7 @@ void NetworkFetcher::PostRequest( ...@@ -36,7 +36,7 @@ void NetworkFetcher::PostRequest(
ResponseStartedCallback response_started_callback, ResponseStartedCallback response_started_callback,
ProgressCallback progress_callback, ProgressCallback progress_callback,
PostRequestCompleteCallback post_request_complete_callback) { PostRequestCompleteCallback post_request_complete_callback) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
post_request_complete_callback_ = std::move(post_request_complete_callback); post_request_complete_callback_ = std::move(post_request_complete_callback);
network_fetcher_->PostRequest( network_fetcher_->PostRequest(
url, post_data, content_type, post_additional_headers, url, post_data, content_type, post_additional_headers,
...@@ -51,7 +51,7 @@ void NetworkFetcher::DownloadToFile( ...@@ -51,7 +51,7 @@ void NetworkFetcher::DownloadToFile(
ResponseStartedCallback response_started_callback, ResponseStartedCallback response_started_callback,
ProgressCallback progress_callback, ProgressCallback progress_callback,
DownloadToFileCompleteCallback download_to_file_complete_callback) { DownloadToFileCompleteCallback download_to_file_complete_callback) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
download_to_file_complete_callback_ = download_to_file_complete_callback_ =
std::move(download_to_file_complete_callback); std::move(download_to_file_complete_callback);
network_fetcher_->DownloadToFile( network_fetcher_->DownloadToFile(
...@@ -62,7 +62,7 @@ void NetworkFetcher::DownloadToFile( ...@@ -62,7 +62,7 @@ void NetworkFetcher::DownloadToFile(
} }
void NetworkFetcher::PostRequestComplete() { void NetworkFetcher::PostRequestComplete() {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
std::move(post_request_complete_callback_) std::move(post_request_complete_callback_)
.Run(std::make_unique<std::string>(network_fetcher_->GetResponseBody()), .Run(std::make_unique<std::string>(network_fetcher_->GetResponseBody()),
network_fetcher_->GetNetError(), network_fetcher_->GetHeaderETag(), network_fetcher_->GetNetError(), network_fetcher_->GetHeaderETag(),
...@@ -71,7 +71,7 @@ void NetworkFetcher::PostRequestComplete() { ...@@ -71,7 +71,7 @@ void NetworkFetcher::PostRequestComplete() {
} }
void NetworkFetcher::DownloadToFileComplete() { void NetworkFetcher::DownloadToFileComplete() {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
std::move(download_to_file_complete_callback_) std::move(download_to_file_complete_callback_)
.Run(network_fetcher_->GetNetError(), network_fetcher_->GetContentSize()); .Run(network_fetcher_->GetNetError(), network_fetcher_->GetContentSize());
} }
...@@ -104,7 +104,7 @@ scoped_hinternet NetworkFetcherFactory::CreateSessionHandle() { ...@@ -104,7 +104,7 @@ scoped_hinternet NetworkFetcherFactory::CreateSessionHandle() {
std::unique_ptr<update_client::NetworkFetcher> NetworkFetcherFactory::Create() std::unique_ptr<update_client::NetworkFetcher> NetworkFetcherFactory::Create()
const { const {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
return session_handle_.get() return session_handle_.get()
? std::make_unique<NetworkFetcher>(session_handle_.get()) ? std::make_unique<NetworkFetcher>(session_handle_.get())
: nullptr; : nullptr;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "base/callback.h" #include "base/callback.h"
#include "base/containers/flat_map.h" #include "base/containers/flat_map.h"
#include "base/memory/scoped_refptr.h" #include "base/memory/scoped_refptr.h"
#include "base/threading/thread_checker.h" #include "base/sequence_checker.h"
#include "components/update_client/network.h" #include "components/update_client/network.h"
#include "url/gurl.h" #include "url/gurl.h"
...@@ -59,7 +59,7 @@ class NetworkFetcher : public update_client::NetworkFetcher { ...@@ -59,7 +59,7 @@ class NetworkFetcher : public update_client::NetworkFetcher {
download_to_file_complete_callback) override; download_to_file_complete_callback) override;
private: private:
THREAD_CHECKER(thread_checker_); SEQUENCE_CHECKER(sequence_checker_);
void PostRequestComplete(); void PostRequestComplete();
void DownloadToFileComplete(); void DownloadToFileComplete();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment