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

Unified Diff: chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/browser/chromeos/settings/device_oauth2_token_service_delegate.h
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h b/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h
index 011c19fe948a1f8b87372c83f6bbf58d20fa4567..1e48fba05dc69e85a8073c99e84b380e5e013886 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_delegate.h
@@ -5,12 +5,12 @@
#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_DELEGATE_H_
#define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_OAUTH2_TOKEN_SERVICE_DELEGATE_H_
+#include <memory>
#include <string>
#include <vector>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/stl_util.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -63,7 +63,7 @@ class DeviceOAuth2TokenServiceDelegate
void OnRefreshTokenResponse(const std::string& access_token,
int expires_in_seconds) override;
void OnGetTokenInfoResponse(
- scoped_ptr<base::DictionaryValue> token_info) override;
+ std::unique_ptr<base::DictionaryValue> token_info) override;
void OnOAuthError() override;
void OnNetworkError(int response_code) override;
@@ -145,9 +145,9 @@ class DeviceOAuth2TokenServiceDelegate
// Cache the decrypted refresh token, so we only decrypt once.
std::string refresh_token_;
- scoped_ptr<gaia::GaiaOAuthClient> gaia_oauth_client_;
+ std::unique_ptr<gaia::GaiaOAuthClient> gaia_oauth_client_;
- scoped_ptr<CrosSettings::ObserverSubscription>
+ std::unique_ptr<CrosSettings::ObserverSubscription>
service_account_identity_subscription_;
base::WeakPtrFactory<DeviceOAuth2TokenServiceDelegate> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698