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

Unified Diff: components/policy/core/common/cloud/cloud_policy_client_registration_helper.h

Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and use namespace alias 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: components/policy/core/common/cloud/cloud_policy_client_registration_helper.h
diff --git a/components/policy/core/common/cloud/cloud_policy_client_registration_helper.h b/components/policy/core/common/cloud/cloud_policy_client_registration_helper.h
index 9290a297cb32f596eeb20f92e139d6813006c5cb..0ae2f43dc80c11dd6f04e02e8a01149bd1cef1ae 100644
--- a/components/policy/core/common/cloud/cloud_policy_client_registration_helper.h
+++ b/components/policy/core/common/cloud/cloud_policy_client_registration_helper.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_CLIENT_REGISTRATION_HELPER_H_
#define COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_CLIENT_REGISTRATION_HELPER_H_
+#include <memory>
#include <string>
#include <vector>
@@ -12,7 +13,6 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "components/policy/core/common/cloud/cloud_policy_client.h"
#include "components/policy/core/common/cloud/user_info_fetcher.h"
@@ -90,18 +90,18 @@ class POLICY_EXPORT CloudPolicyClientRegistrationHelper
// access token. On desktop, this is only used after the user has signed in -
// desktop platforms use LoginTokenHelper for policy fetches performed before
// signin is complete.
- scoped_ptr<TokenServiceHelper> token_service_helper_;
+ std::unique_ptr<TokenServiceHelper> token_service_helper_;
#if !defined(OS_ANDROID)
// Special desktop-only helper to fetch an OAuth access token prior to
// the completion of signin. Not used on Android since all token fetching
// is done via OAuth2TokenService.
- scoped_ptr<LoginTokenHelper> login_token_helper_;
+ std::unique_ptr<LoginTokenHelper> login_token_helper_;
#endif
// Helper class for fetching information from GAIA about the currently
// signed-in user.
- scoped_ptr<UserInfoFetcher> user_info_fetcher_;
+ std::unique_ptr<UserInfoFetcher> user_info_fetcher_;
// Access token used to register the CloudPolicyClient and also access
// GAIA to get information about the signed in user.

Powered by Google App Engine
This is Rietveld 408576698