Supervised user Apiary permission requests: Use correct API scope.

chrome/browser/supervised_user/permission_request_creator_apiary.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/supervised_user/permission_request_creator_apiary.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 51 matching lines @@
 }
 
 void PermissionRequestCreatorApiary::CreatePermissionRequest(
     const GURL& url_requested,
     const base::Closure& callback) {
   url_requested_ = url_requested;
   callback_ = callback;
   StartFetching();
 }
 
+std::string PermissionRequestCreatorApiary::GetApiScopeToUse() const {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kPermissionRequestApiScope)) {
+    return CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+        switches::kPermissionRequestApiScope);
+  } else {
+    return signin_wrapper_->GetSyncScopeToUse();
+  }
+}
+
 void PermissionRequestCreatorApiary::StartFetching() {
   OAuth2TokenService::ScopeSet scopes;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kPermissionRequestApiScope)) {
-    scopes.insert(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-        switches::kPermissionRequestApiScope));
-  } else {
-    scopes.insert(signin_wrapper_->GetSyncScopeToUse());
-  }
+  scopes.insert(GetApiScopeToUse());
   access_token_request_ = oauth2_token_service_->StartRequest(
       signin_wrapper_->GetAccountIdToUse(), scopes, this);
 }
 
 void PermissionRequestCreatorApiary::OnGetTokenSuccess(
     const OAuth2TokenService::Request* request,
     const std::string& access_token,
     const base::Time& expiration_time) {
   DCHECK_EQ(access_token_request_.get(), request);
   access_token_ = access_token;
@@ skipping 34 matching lines @@
   const net::URLRequestStatus& status = source->GetStatus();
   if (!status.is_success()) {
     DispatchNetworkError(status.error());
     return;
   }
 
   int response_code = source->GetResponseCode();
   if (response_code == net::HTTP_UNAUTHORIZED && !access_token_expired_) {
     access_token_expired_ = true;
     OAuth2TokenService::ScopeSet scopes;
-    scopes.insert(signin_wrapper_->GetSyncScopeToUse());
+    scopes.insert(GetApiScopeToUse());
     oauth2_token_service_->InvalidateToken(
         signin_wrapper_->GetAccountIdToUse(), scopes, access_token_);
     StartFetching();
     return;
   }
 
   if (response_code != net::HTTP_OK) {
     DLOG(WARNING) << "HTTP error " << response_code;
     DispatchGoogleServiceAuthError(
         GoogleServiceAuthError(GoogleServiceAuthError::CONNECTION_FAILED));
@@ skipping 20 matching lines @@
 void PermissionRequestCreatorApiary::DispatchNetworkError(int error_code) {
   DispatchGoogleServiceAuthError(
       GoogleServiceAuthError::FromConnectionError(error_code));
 }
 
 void PermissionRequestCreatorApiary::DispatchGoogleServiceAuthError(
     const GoogleServiceAuthError& error) {
   callback_.Run();
   callback_.Reset();
 }