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

Unified Diff: chrome/service/cloud_print/cloud_print_proxy.cc

Issue 2914573002: Replace deprecated base::NonThreadSafe in chrome/service in favor of SequenceChecker. (Closed)
Patch Set: 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
Index: chrome/service/cloud_print/cloud_print_proxy.cc
diff --git a/chrome/service/cloud_print/cloud_print_proxy.cc b/chrome/service/cloud_print/cloud_print_proxy.cc
index 4ba9616b2fc2adce7f63acfa85f991e0256273f8..02404069ec95d795704f0946c36523c457cd9b50 100644
--- a/chrome/service/cloud_print/cloud_print_proxy.cc
+++ b/chrome/service/cloud_print/cloud_print_proxy.cc
@@ -33,19 +33,19 @@ CloudPrintProxy::CloudPrintProxy()
}
CloudPrintProxy::~CloudPrintProxy() {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
ShutdownBackend();
}
void CloudPrintProxy::Initialize(ServiceProcessPrefs* service_prefs,
Client* client) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
service_prefs_ = service_prefs;
client_ = client;
}
void CloudPrintProxy::EnableForUser() {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (!CreateBackend())
return;
DCHECK(backend_.get());
@@ -78,7 +78,7 @@ void CloudPrintProxy::EnableForUserWithRobot(
const std::string& robot_email,
const std::string& user_email,
const base::DictionaryValue& user_settings) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
ShutdownBackend();
std::string proxy_id(
@@ -103,7 +103,7 @@ void CloudPrintProxy::EnableForUserWithRobot(
}
bool CloudPrintProxy::CreateBackend() {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (backend_.get())
return false;
@@ -127,7 +127,7 @@ bool CloudPrintProxy::CreateBackend() {
}
void CloudPrintProxy::UnregisterPrintersAndDisableForUser() {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (backend_.get()) {
// Try getting auth and printers info from the backend.
// We'll get notified in this case.
@@ -139,7 +139,7 @@ void CloudPrintProxy::UnregisterPrintersAndDisableForUser() {
}
void CloudPrintProxy::DisableForUser() {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
user_email_.clear();
enabled_ = false;
if (client_) {
@@ -178,7 +178,7 @@ void CloudPrintProxy::OnAuthenticated(
const std::string& robot_oauth_refresh_token,
const std::string& robot_email,
const std::string& user_email) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
service_prefs_->SetString(prefs::kCloudPrintRobotRefreshToken,
robot_oauth_refresh_token);
service_prefs_->SetString(prefs::kCloudPrintRobotEmail,
@@ -203,7 +203,7 @@ void CloudPrintProxy::OnAuthenticated(
}
void CloudPrintProxy::OnAuthenticationFailed() {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
// Don't disable permanently. Could be just connection issue.
ShutdownBackend();
if (client_) {
@@ -233,7 +233,7 @@ void CloudPrintProxy::OnUnregisterPrinters(
}
void CloudPrintProxy::OnXmppPingUpdated(int ping_timeout) {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
service_prefs_->SetInt(prefs::kCloudPrintXmppPingTimeout, ping_timeout);
service_prefs_->WritePrefs();
}
@@ -245,7 +245,7 @@ void CloudPrintProxy::OnUnregisterPrintersComplete() {
}
void CloudPrintProxy::ShutdownBackend() {
- DCHECK(CalledOnValidThread());
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (backend_.get())
backend_->Shutdown();
backend_.reset();
« no previous file with comments | « chrome/service/cloud_print/cloud_print_proxy.h ('k') | chrome/service/cloud_print/cloud_print_token_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698