Browser tests for the new way of handling device ID in Chrome OS.

google_apis/gaia/fake_gaia.h

 // Copyright (c) 2013 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_FAKE_GAIA_H_
 #define GOOGLE_APIS_GAIA_FAKE_GAIA_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 14 matching lines @@
 class HttpResponse;
 }
 }
 
 // This is a test helper that implements a fake GAIA service for use in browser
 // tests. It's mainly intended for use with EmbeddedTestServer, for which it can
 // be registered as an additional request handler.
 class FakeGaia {
  public:
   typedef std::set<std::string> ScopeSet;
+  typedef std::map<std::string, std::string> RefreshTokenToDeviceIdMap;

[achuithb, 2015/05/28 00:18:57]

Perhaps replace both typedefs with using?

[dzhioev (left Google), 2015/05/28 02:21:42]

Done.

 
   // Access token details used for token minting and the token info endpoint.
   struct AccessTokenInfo {
     AccessTokenInfo();
     ~AccessTokenInfo();
 
     std::string token;
     std::string issued_to;
     std::string audience;
     std::string user_id;
     ScopeSet scopes;
     int expires_in;
     std::string email;
   };
 
   // Cookies and tokens for /MergeSession call seqeunce.
   struct MergeSessionParams {
     MergeSessionParams();
     ~MergeSessionParams();
 
+    // Updates params with non-empty values from |update|.
+    void Update(const MergeSessionParams& update);

[achuithb, 2015/05/28 00:18:57]

call args params for consistency?

[dzhioev (left Google), 2015/05/28 02:21:42]

Done.

+
     // Values of SID and LSID cookie that are set by /ServiceLoginAuth or its
     // equivalent at the end of the SAML login flow.
     std::string auth_sid_cookie;
     std::string auth_lsid_cookie;
 
     // auth_code cookie value response for /o/oauth2/programmatic_auth call.
     std::string auth_code;
 
     // OAuth2 refresh and access token generated by /o/oauth2/token call
     // with "...&grant_type=authorization_code".
@@ skipping 14 matching lines @@
   FakeGaia();
   virtual ~FakeGaia();
 
   void SetFakeMergeSessionParams(const std::string& email,
                                  const std::string& auth_sid_cookie,
                                  const std::string& auth_lsid_cookie);
 
   // Sets the initial value of tokens and cookies.
   void SetMergeSessionParams(const MergeSessionParams& params);
 
+  // Updates various params with non-empty values from |update|.

[achuithb, 2015/05/28 00:18:57]

|params|

[dzhioev (left Google), 2015/05/28 02:21:42]

Done.

+  void UpdateMergeSessionParams(const MergeSessionParams& params);
+
   // Sets the specified |gaia_id| as corresponding to the given |email|
   // address when setting GAIA response headers.  If no mapping is given for
   // an email address, a default GAIA Id is used.
   void MapEmailToGaiaId(const std::string& email, const std::string& gaia_id);
 
   // Initializes HTTP request handlers. Should be called after switches
   // for tweaking GaiaUrls are in place.
   void Initialize();
 
   // Handles a request and returns a response if the request was recognized as a
@@ skipping 16 matching lines @@
 
   void set_issue_oauth_code_cookie(bool value) {
     issue_oauth_code_cookie_ = value;
   }
 
   // Extracts the parameter named |key| from |query| and places it in |value|.
   // Returns false if no parameter is found.
   static bool GetQueryParameter(const std::string& query,
                                 const std::string& key,
                                 std::string* value);
+
+  // Returns a device ID associated with a given refresh token.

[achuithb, 2015/05/28 00:18:57]

|refresh_token|

[dzhioev (left Google), 2015/05/28 02:21:42]

Done.

+  std::string GetDeviceIdByRefreshToken(const std::string& refresh_token) const;
+
+  void SetRefreshTokenToDeviceIdMap(
+      const RefreshTokenToDeviceIdMap& refresh_token_to_device_id_map);
+
+  const RefreshTokenToDeviceIdMap& refresh_token_to_device_id_map() const {
+    return refresh_token_to_device_id_map_;
+  }
+
  protected:
   // HTTP handler for /MergeSession.
   virtual void HandleMergeSession(
       const net::test_server::HttpRequest& request,
       net::test_server::BasicHttpResponse* http_response);
 
  private:
   typedef std::multimap<std::string, AccessTokenInfo> AccessTokenInfoMap;
   typedef std::map<std::string, std::string> EmailToGaiaIdMap;
   typedef std::map<std::string, GURL> SamlAccountIdpMap;
@@ skipping 68 matching lines @@
       const std::string& access_token) const;
 
   MergeSessionParams merge_session_params_;
   EmailToGaiaIdMap email_to_gaia_id_map_;
   AccessTokenInfoMap access_token_info_map_;
   RequestHandlerMap request_handlers_;
   std::string service_login_response_;
   std::string embedded_setup_chromeos_response_;
   SamlAccountIdpMap saml_account_idp_map_;
   bool issue_oauth_code_cookie_;
+  RefreshTokenToDeviceIdMap refresh_token_to_device_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeGaia);
 };
 
 #endif  // GOOGLE_APIS_GAIA_FAKE_GAIA_H_