Network traffic annotation added to gaia_auth_fetcher.

google_apis/gaia/gaia_auth_fetcher.h

 // Copyright (c) 2012 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 GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_
 #define GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/google_service_auth_error.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 // Authenticate a user against the Google Accounts ClientLogin API
 // with various capabilities and return results to a GaiaAuthConsumer.
 //
 // In the future, we will also issue auth tokens from this class.
 // This class should be used on a single thread, but it can be whichever thread
 // that you like.
 //
@@ skipping 18 matching lines @@
   // Apps enabled, the user provided the right password.
   static const char kWebLoginRequired[];
 
   // This will later be hidden behind an auth service which caches
   // tokens.
   GaiaAuthFetcher(GaiaAuthConsumer* consumer,
                   const std::string& source,
                   net::URLRequestContextGetter* getter);
   ~GaiaAuthFetcher() override;
 
-  // Start a request to obtain service token for the the account identified by
-  // |sid| and |lsid| and the |service|.
-  //
-  // Either OnIssueAuthTokenSuccess or OnIssueAuthTokenFailure will be
-  // called on the consumer on the original thread.
-  void StartIssueAuthToken(const std::string& sid,
-                           const std::string& lsid,
-                           const char* const service);
-
   // Start a request to obtain |service| token for the the account identified by
   // |uber_token|.
   //
   // Either OnIssueAuthTokenSuccess or OnIssueAuthTokenFailure will be
   // called on the consumer on the original thread.
   void StartTokenAuth(const std::string& uber_token,
                       const char* const service);
 
   // Start a request to obtain service token for the the account identified by
   // |oauth2_access_token| and the |service|.
@@ skipping 118 matching lines @@
   void StartListAccounts();
 
   // Starts a request to log out the accounts in the GAIA cookie.
   void StartLogOut();
 
   // Starts a request to get the list of URLs to check for connection info.
   // Returns token/URL pairs to check, and the resulting status can be given to
   // /MergeSession requests.
   void StartGetCheckConnectionInfo();
 
-  // Starts listing any sessions that exist for the IDP. If all requested scopes
-  // have been approved by the session user, then a login hint is included in
-  // the response.
-  void StartListIDPSessions(const std::string& scopes,
-                            const std::string& domain);
-
-  // Generates an access token for the session, specifying the scopes and
-  // |login_hint|.
-  void StartGetTokenResponse(const std::string& scopes,
-                             const std::string& domain,
-                             const std::string& login_hint);
-
   // Implementation of net::URLFetcherDelegate
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // StartClientLogin been called && results not back yet?
   bool HasPendingFetch();
 
   // Stop any URL fetches in progress.
   virtual void CancelRequest();
 
   // From a URLFetcher result, generate an appropriate error.
   // From the API documentation, both IssueAuthToken and ClientLogin have
   // the same error returns.
   static GoogleServiceAuthError GenerateOAuthLoginError(
       const std::string& data,
       const net::URLRequestStatus& status);
 
  protected:
   // Create and start |fetcher_|, used to make all Gaia request.  |body| is
   // used as the body of the POST request sent to GAIA.  Any strings listed in
   // |headers| are added as extra HTTP headers in the request.
   //
   // |load_flags| are passed to directly to net::URLFetcher::Create() when
   // creating the URL fetcher.
   //
   // HasPendingFetch() should return false before calling this method, and will
   // return true afterwards.
-  virtual void CreateAndStartGaiaFetcher(const std::string& body,
-                                         const std::string& headers,
-                                         const GURL& gaia_gurl,
-                                         int load_flags);
+  virtual void CreateAndStartGaiaFetcher(
+      const std::string& body,
+      const std::string& headers,
+      const GURL& gaia_gurl,
+      int load_flags,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation);
 
   // Dispatch the results of a request.
   void DispatchFetchedRequest(const GURL& url,
                               const std::string& data,
                               const net::ResponseCookies& cookies,
                               const net::URLRequestStatus& status,
                               int response_code);
 
   void SetPendingFetch(bool pending_fetch);
 
@@ skipping 221 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ParseOAuth2TokenPairResponse);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthSuccess);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthWithQuote);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthChallengeSuccess);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthChallengeQuote);
 
   DISALLOW_COPY_AND_ASSIGN(GaiaAuthFetcher);
 };
 
 #endif  // GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_