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

Unified Diff: chrome/browser/chromeos/settings/session_manager_operation.cc

Issue 568413004: Remove implicit conversions from scoped_refptr to T* in c/b/chromeos/settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « chrome/browser/chromeos/settings/device_settings_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/settings/session_manager_operation.cc
diff --git a/chrome/browser/chromeos/settings/session_manager_operation.cc b/chrome/browser/chromeos/settings/session_manager_operation.cc
index 436ea0f416c62788a38e2fbb6870e72dd8237a04..f8da691b2e89be9310a3555969a18ae418606beb 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation.cc
+++ b/chrome/browser/chromeos/settings/session_manager_operation.cc
@@ -74,7 +74,7 @@ void SessionManagerOperation::ReportResult(
}
void SessionManagerOperation::EnsurePublicKey(const base::Closure& callback) {
- if (force_key_load_ || !public_key_ || !public_key_->is_loaded()) {
+ if (force_key_load_ || !public_key_.get() || !public_key_->is_loaded()) {
scoped_refptr<base::TaskRunner> task_runner =
content::BrowserThread::GetBlockingPool()
->GetTaskRunnerWithShutdownBehavior(
@@ -100,7 +100,7 @@ scoped_refptr<PublicKey> SessionManagerOperation::LoadPublicKey(
scoped_refptr<PublicKey> public_key(new PublicKey());
// Keep already-existing public key.
- if (current_key && current_key->is_loaded()) {
+ if (current_key.get() && current_key->is_loaded()) {
public_key->data() = current_key->data();
}
if (!public_key->is_loaded() && util->IsPublicKeyPresent()) {
@@ -116,7 +116,7 @@ void SessionManagerOperation::StorePublicKey(const base::Closure& callback,
force_key_load_ = false;
public_key_ = new_key;
- if (!public_key_ || !public_key_->is_loaded()) {
+ if (!public_key_.get() || !public_key_->is_loaded()) {
ReportResult(DeviceSettingsService::STORE_KEY_UNAVAILABLE);
return;
}
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698