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

Unified Diff: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

Issue 569173006: Remove implicit conversions from scoped_refptr to T* in c/b/chromeos/ownership (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include manual fixes 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
index 6f04ebbf5160729816c18057aaec8f3a9da57a3c..037df4ea963351ab9601afbabaf385dfaae5f594 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
@@ -122,7 +122,7 @@ bool DoesPrivateKeyExistAsyncHelper(
void DoesPrivateKeyExistAsync(
const scoped_refptr<OwnerKeyUtil>& owner_key_util,
const OwnerSettingsServiceChromeOS::IsOwnerCallback& callback) {
- if (!owner_key_util) {
+ if (!owner_key_util.get()) {
callback.Run(false);
return;
}
@@ -304,8 +304,8 @@ void OwnerSettingsServiceChromeOS::HandleCompletedOperation(
service->set_device_settings(operation->device_settings().Pass());
}
- if ((operation->public_key() && !public_key_) ||
- (operation->public_key() && public_key_ &&
+ if ((operation->public_key().get() && !public_key_.get()) ||
+ (operation->public_key().get() && public_key_.get() &&
operation->public_key()->data() != public_key_->data())) {
// Public part changed so we need to reload private part too.
ReloadKeypair();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698