Supervised Users: Add tests for PermissionRequestCreatorApiary.

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 18 matching lines @@
 using net::URLFetcher;
 
 const int kNumRetries = 1;
 const char kIdKey[] = "id";
 const char kNamespace[] = "CHROME";
 const char kState[] = "PENDING";
 
 static const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s";
 
 struct PermissionRequestCreatorApiary::Request {
-  Request(const GURL& url_requested, const SuccessCallback& callback);
+  Request(const GURL& url_requested,
+          const SuccessCallback& callback,
+          int url_fetcher_id);
   ~Request();
 
   GURL url_requested;
   SuccessCallback callback;
   scoped_ptr<OAuth2TokenService::Request> access_token_request;
   std::string access_token;
   bool access_token_expired;
+  int url_fetcher_id;
   scoped_ptr<net::URLFetcher> url_fetcher;
 };
 
 PermissionRequestCreatorApiary::Request::Request(
     const GURL& url_requested,
-    const SuccessCallback& callback)
+    const SuccessCallback& callback,
+    int url_fetcher_id)
     : url_requested(url_requested),
       callback(callback),
-      access_token_expired(false) {
+      access_token_expired(false),
+      url_fetcher_id(url_fetcher_id) {
 }
 
 PermissionRequestCreatorApiary::Request::~Request() {}
 
 PermissionRequestCreatorApiary::PermissionRequestCreatorApiary(
     OAuth2TokenService* oauth2_token_service,
     scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper,
     net::URLRequestContextGetter* context,
     const GURL& apiary_url)
     : OAuth2TokenService::Consumer("permissions_creator"),
       oauth2_token_service_(oauth2_token_service),
       signin_wrapper_(signin_wrapper.Pass()),
       context_(context),
-      apiary_url_(apiary_url) {
+      apiary_url_(apiary_url),
+      url_fetcher_id_(0) {
   DCHECK(apiary_url_.is_valid());
 }
 
 PermissionRequestCreatorApiary::~PermissionRequestCreatorApiary() {}
 
 // static
 scoped_ptr<PermissionRequestCreator>
 PermissionRequestCreatorApiary::CreateWithProfile(Profile* profile,
                                                   const GURL& apiary_url) {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
   scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper(
       new SupervisedUserSigninManagerWrapper(profile, signin));
   return make_scoped_ptr(new PermissionRequestCreatorApiary(
       token_service, signin_wrapper.Pass(), profile->GetRequestContext(),
       apiary_url));
 }
 
 bool PermissionRequestCreatorApiary::IsEnabled() const {
   return true;
 }
 
 void PermissionRequestCreatorApiary::CreatePermissionRequest(
     const GURL& url_requested,
     const SuccessCallback& callback) {
-  requests_.push_back(new Request(url_requested, callback));
+  requests_.push_back(new Request(url_requested, callback, url_fetcher_id_));
   StartFetching(requests_.back());
 }
 
 std::string PermissionRequestCreatorApiary::GetApiScopeToUse() const {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kPermissionRequestApiScope)) {
     return CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kPermissionRequestApiScope);
   } else {
     return signin_wrapper_->GetSyncScopeToUse();
@@ skipping 12 matching lines @@
     const std::string& access_token,
     const base::Time& expiration_time) {
   RequestIterator it = requests_.begin();
   while (it != requests_.end()) {
     if (request == (*it)->access_token_request.get())
       break;
     ++it;
   }
   DCHECK(it != requests_.end());
   (*it)->access_token = access_token;
-  const int id = 0;
 
-  (*it)->url_fetcher.reset(
-      URLFetcher::Create(id, apiary_url_, URLFetcher::POST, this));
+  (*it)->url_fetcher.reset(URLFetcher::Create((*it)->url_fetcher_id,
+                                              apiary_url_,
+                                              URLFetcher::POST,
+                                              this));
 
   (*it)->url_fetcher->SetRequestContext(context_);
   (*it)->url_fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                    net::LOAD_DO_NOT_SAVE_COOKIES);
   (*it)->url_fetcher->SetAutomaticallyRetryOnNetworkChanges(kNumRetries);
   (*it)->url_fetcher->AddExtraRequestHeader(
       base::StringPrintf(kAuthorizationHeaderFormat, access_token.c_str()));
 
   base::DictionaryValue dict;
   dict.SetStringWithoutPathExpansion("namespace", kNamespace);
@@ skipping 76 matching lines @@
   DispatchGoogleServiceAuthError(
       it, GoogleServiceAuthError::FromConnectionError(error_code));
 }
 
 void PermissionRequestCreatorApiary::DispatchGoogleServiceAuthError(
     RequestIterator it,
     const GoogleServiceAuthError& error) {
   (*it)->callback.Run(false);
   requests_.erase(it);
 }