Have the authenticating_url_loader cache token per-origin.

services/authenticating_url_loader/authenticating_url_loader_impl.h

 // 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.
 
 #ifndef SERVICES_AUTHENTICATING_URL_LOADER_AUTHENTICATING_URL_LOADER_IMPL_H_
 #define SERVICES_AUTHENTICATING_URL_LOADER_AUTHENTICATING_URL_LOADER_IMPL_H_
 
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/services/authenticating_url_loader/public/interfaces/authenticating_url_loader.mojom.h"
 #include "mojo/services/authentication/public/interfaces/authentication.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "url/gurl.h"
 
 namespace mojo {
 
 class NetworkService;
 
 enum RequestAuthorizationState {
   REQUEST_NOT_AUTHORIZED,

[blundell, 2015/05/27 15:43:44]

These names are misleading now.

How about

REQUEST_INITIAL,
REQUEST_USED_CURRENT_AUTH_SERVICE_TOKEN,
REQUEST_USED_FRESH_AUTH_SERVICE_TOKEN

?

[qsr, 2015/05/27 16:02:26]

Done.

   REQUEST_AUTHORIZED_WITH_CACHED_TOKEN,
   REQUEST_AUTHORIZED_WITH_FRESH_TOKEN,
 };
 
 class AuthenticatingURLLoaderImpl : public AuthenticatingURLLoader,
                                     public ErrorHandler {
  public:
   AuthenticatingURLLoaderImpl(
       InterfaceRequest<AuthenticatingURLLoader> request,
       authentication::AuthenticationService* authentication_service,
       NetworkService* network_service,
+      std::map<GURL, std::string>* cached_tokens,
       const Callback<void(AuthenticatingURLLoaderImpl*)>&
           connection_error_callback);
   ~AuthenticatingURLLoaderImpl() override;
 
   void SetAuthenticationService(
       authentication::AuthenticationService* authentication_service);
 
  private:
   // AuthenticatingURLLoader methods:
   void Start(URLRequestPtr request,
@@ skipping 10 matching lines @@
 
   void OnOAuth2TokenReceived(String token, String error);
 
   Binding<AuthenticatingURLLoader> binding_;
   authentication::AuthenticationService* authentication_service_;
   NetworkService* network_service_;
   Callback<void(AuthenticatingURLLoaderImpl*)> connection_error_callback_;
   URLLoaderPtr url_loader_;
   URLResponsePtr pending_response_;
   RequestAuthorizationState request_authorization_state_;
-  String url_;
+  GURL url_;
   bool auto_follow_redirects_;
   bool bypass_cache_;
   Array<String> headers_;
   String username_;
   String token_;
   Callback<void(URLResponsePtr)> pending_start_callback_;
+  std::map<GURL, std::string>* cached_tokens_;
 };
 
 }  // namespace mojo
 
 #endif  // SERVICES_AUTHENTICATING_URL_LOADER_AUTHENTICATING_URL_LOADER_IMPL_H_