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

Unified Diff: chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc

Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/supervised_user/child_accounts/permission_request_creator_apiary.cc
diff --git a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc
index d9b6dc27f5cd321fb100553bd151db00196ce1bd..1940e615aa75e17759580a95d3277a3fa29f85cd 100644
--- a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc
+++ b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc
@@ -9,6 +9,7 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "chrome/browser/profiles/profile.h"
@@ -60,11 +61,11 @@ struct PermissionRequestCreatorApiary::Request {
std::string request_type;
std::string object_ref;
SuccessCallback callback;
- scoped_ptr<OAuth2TokenService::Request> access_token_request;
+ std::unique_ptr<OAuth2TokenService::Request> access_token_request;
std::string access_token;
bool access_token_expired;
int url_fetcher_id;
- scoped_ptr<URLFetcher> url_fetcher;
+ std::unique_ptr<URLFetcher> url_fetcher;
};
PermissionRequestCreatorApiary::Request::Request(
@@ -95,14 +96,13 @@ PermissionRequestCreatorApiary::PermissionRequestCreatorApiary(
PermissionRequestCreatorApiary::~PermissionRequestCreatorApiary() {}
// static
-scoped_ptr<PermissionRequestCreator>
+std::unique_ptr<PermissionRequestCreator>
PermissionRequestCreatorApiary::CreateWithProfile(Profile* profile) {
ProfileOAuth2TokenService* token_service =
ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
- return make_scoped_ptr(new PermissionRequestCreatorApiary(
- token_service,
- signin->GetAuthenticatedAccountId(),
+ return base::WrapUnique(new PermissionRequestCreatorApiary(
+ token_service, signin->GetAuthenticatedAccountId(),
profile->GetRequestContext()));
}
@@ -246,7 +246,7 @@ void PermissionRequestCreatorApiary::OnURLFetchComplete(
std::string response_body;
source->GetResponseAsString(&response_body);
- scoped_ptr<base::Value> value = base::JSONReader::Read(response_body);
+ std::unique_ptr<base::Value> value = base::JSONReader::Read(response_body);
base::DictionaryValue* dict = NULL;
if (!value || !value->GetAsDictionary(&dict)) {
LOG(WARNING) << "Invalid top-level dictionary";

Powered by Google App Engine
This is Rietveld 408576698