Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / supervised_user / permission_request_creator_apiary.cc

diff --git a/src/chrome/browser/supervised_user/permission_request_creator_apiary.cc b/src/chrome/browser/supervised_user/permission_request_creator_apiary.cc
index a590fdb..bfbc0dd 100644 (file)
--- a/src/chrome/browser/supervised_user/permission_request_creator_apiary.cc
+++ b/src/chrome/browser/supervised_user/permission_request_creator_apiary.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"
+#include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
@@ -37,7 +37,7 @@ static const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s";
 
 PermissionRequestCreatorApiary::PermissionRequestCreatorApiary(
     OAuth2TokenService* oauth2_token_service,
-    scoped_ptr<ManagedUserSigninManagerWrapper> signin_wrapper,
+    scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper,
     net::URLRequestContextGetter* context)
     : OAuth2TokenService::Consumer("permissions_creator"),
       oauth2_token_service_(oauth2_token_service),
@@ -53,8 +53,8 @@ PermissionRequestCreatorApiary::CreateWithProfile(Profile* profile) {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
-  scoped_ptr<ManagedUserSigninManagerWrapper> signin_wrapper(
-      new ManagedUserSigninManagerWrapper(profile, signin));
+  scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper(
+      new SupervisedUserSigninManagerWrapper(profile, signin));
   scoped_ptr<PermissionRequestCreator> creator(
       new PermissionRequestCreatorApiary(
           token_service, signin_wrapper.Pass(), profile->GetRequestContext()));
@@ -71,7 +71,13 @@ void PermissionRequestCreatorApiary::CreatePermissionRequest(
 
 void PermissionRequestCreatorApiary::StartFetching() {
   OAuth2TokenService::ScopeSet scopes;
-  scopes.insert(signin_wrapper_->GetSyncScopeToUse());
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kPermissionRequestApiScope)) {
+    scopes.insert(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+        switches::kPermissionRequestApiScope));
+  } else {
+    scopes.insert(signin_wrapper_->GetSyncScopeToUse());
+  }
   access_token_request_ = oauth2_token_service_->StartRequest(
       signin_wrapper_->GetAccountIdToUse(), scopes, this);
 }