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

Unified Diff: chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.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/login/easy_unlock/bootstrap_user_context_initializer.h
diff --git a/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.h b/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.h
index 2317a1c6811bae52cc8bc97a604b01b9fe6ec3f0..a384475faee83f14e2c2279a01b833a6e2a8ce62 100644
--- a/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.h
+++ b/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_BOOTSTRAP_USER_CONTEXT_INITIALIZER_H_
#define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_BOOTSTRAP_USER_CONTEXT_INITIALIZER_H_
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h"
#include "chrome/browser/signin/easy_unlock_auth_attempt.h"
@@ -69,7 +69,7 @@ class BootstrapUserContextInitializer final
void OnRefreshTokenResponse(const std::string& access_token,
int expires_in_seconds) override;
void OnGetUserInfoResponse(
- scoped_ptr<base::DictionaryValue> user_info) override;
+ std::unique_ptr<base::DictionaryValue> user_info) override;
void OnOAuthError() override;
void OnNetworkError(int response_code) override;
@@ -77,7 +77,7 @@ class BootstrapUserContextInitializer final
void OnScreenlockStateChanged(proximity_auth::ScreenlockState state) override;
CompleteCallback callback_;
- scoped_ptr<gaia::GaiaOAuthClient> token_fetcher_;
+ std::unique_ptr<gaia::GaiaOAuthClient> token_fetcher_;
UserContext user_context_;
bool random_key_used_;

Powered by Google App Engine
This is Rietveld 408576698