Network traffic annotation added to OAuth2ApiCallFlow and its subclasses.

components/cryptauth/cryptauth_client_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 COMPONENTS_CRYPTAUTH_CRYPTAUTH_CLIENT_IMPL_H_
 #define COMPONENTS_CRYPTAUTH_CRYPTAUTH_CLIENT_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/cryptauth/cryptauth_access_token_fetcher.h"
 #include "components/cryptauth/cryptauth_api_call_flow.h"
 #include "components/cryptauth/cryptauth_client.h"
 #include "components/cryptauth/proto/cryptauth_api.pb.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_request_context_getter.h"
 
 class OAuth2TokenService;
 
 namespace cryptauth {
 
 // Implementation of CryptAuthClient.
 // Note: There is no need to set the |device_classifier| field in request
 // messages. CryptAuthClient will fill this field for all requests.
 class CryptAuthClientImpl : public CryptAuthClient {
  public:
   typedef base::Callback<void(const std::string&)> ErrorCallback;
 
   // Creates the client using |url_request_context| to make the HTTP request
   // through |api_call_flow|. CryptAuthClientImpl takes ownership of
   // |access_token_fetcher|, which provides the access token authorizing
   // CryptAuth requests. The |device_classifier| argument contains basic device
   // information of the caller (e.g. version and device type).
   CryptAuthClientImpl(
       std::unique_ptr<CryptAuthApiCallFlow> api_call_flow,
       std::unique_ptr<CryptAuthAccessTokenFetcher> access_token_fetcher,
       scoped_refptr<net::URLRequestContextGetter> url_request_context,
       const DeviceClassifier& device_classifier);
   ~CryptAuthClientImpl() override;
 
   // CryptAuthClient:
   void GetMyDevices(const GetMyDevicesRequest& request,
                     const GetMyDevicesCallback& callback,
-                    const ErrorCallback& error_callback) override;
+                    const ErrorCallback& error_callback,
+                    const net::PartialNetworkTrafficAnnotationTag&
+                        partial_traffic_annotation) override;
   void FindEligibleUnlockDevices(
       const FindEligibleUnlockDevicesRequest& request,
       const FindEligibleUnlockDevicesCallback& callback,
       const ErrorCallback& error_callback) override;
-  void SendDeviceSyncTickle(
-      const SendDeviceSyncTickleRequest& request,
-      const SendDeviceSyncTickleCallback& callback,
-      const ErrorCallback& error_callback) override;
+  void SendDeviceSyncTickle(const SendDeviceSyncTickleRequest& request,
+                            const SendDeviceSyncTickleCallback& callback,
+                            const ErrorCallback& error_callback,
+                            const net::PartialNetworkTrafficAnnotationTag&
+                                partial_traffic_annotation) override;
   void ToggleEasyUnlock(const ToggleEasyUnlockRequest& request,
                         const ToggleEasyUnlockCallback& callback,
                         const ErrorCallback& error_callback) override;
   void SetupEnrollment(const SetupEnrollmentRequest& request,
                        const SetupEnrollmentCallback& callback,
                        const ErrorCallback& error_callback) override;
   void FinishEnrollment(const FinishEnrollmentRequest& request,
                         const FinishEnrollmentCallback& callback,
                         const ErrorCallback& error_callback) override;
   std::string GetAccessTokenUsed() override;
 
  private:
   // Starts a call to the API given by |request_path|, with the templated
   // request and response types. The client first fetches the access token and
   // then makes the HTTP request.
   template <class RequestProto, class ResponseProto>
   void MakeApiCall(
       const std::string& request_path,
       const RequestProto& request_proto,
       const base::Callback<void(const ResponseProto&)>& response_callback,
-      const ErrorCallback& error_callback);
+      const ErrorCallback& error_callback,
+      const net::PartialNetworkTrafficAnnotationTag&
+          partial_traffic_annotation);
 
   // Called when the access token is obtained so the API request can be made.
   template <class ResponseProto>
   void OnAccessTokenFetched(
       const std::string& serialized_request,
       const base::Callback<void(const ResponseProto&)>& response_callback,
       const std::string& access_token);
 
   // Called with CryptAuthApiCallFlow completes successfully to deserialize and
   // return the result.
@@ skipping 59 matching lines @@
   const std::string account_id_;
   const scoped_refptr<net::URLRequestContextGetter> url_request_context_;
   const DeviceClassifier device_classifier_;
 
   DISALLOW_COPY_AND_ASSIGN(CryptAuthClientFactoryImpl);
 };
 
 }  // namespace cryptauth
 
 #endif  // COMPONENTS_CRYPTAUTH_CRYPTAUTH_CLIENT_IMPL_H_