When the user signs in, make sure to set cookies on all reachable google

google_apis/gaia/merge_session_helper.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 GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_
 #define GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_
 
 #include <deque>
 
 #include "base/observer_list.h"
+#include "base/timer/timer.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/ubertoken_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 class GaiaAuthFetcher;
 class GoogleServiceAuthError;
 class OAuth2TokenService;
 
 namespace net {
+class URLFetcher;
 class URLRequestContextGetter;
 }
 
 // Merges a Google account known to Chrome into the cookie jar.  When merging
 // multiple accounts, one instance of the helper is better than multiple
 // instances if there is the possibility that they run concurrently, since
 // changes to the cookie must be serialized.
 //
 // By default instances of MergeSessionHelper delete themselves when done.
 class MergeSessionHelper : public GaiaAuthConsumer,
                            public UbertokenConsumer,
                            public net::URLFetcherDelegate {
  public:
   class Observer {
    public:
     // Called whenever a merge session is completed.  The account that was
     // merged is given by |account_id|.  If |error| is equal to
     // GoogleServiceAuthError::AuthErrorNone() then the merge succeeeded.
     virtual void MergeSessionCompleted(const std::string& account_id,
                                        const GoogleServiceAuthError& error) = 0;
    protected:
     virtual ~Observer() {}
   };
 
+  // Class to retrieve the external connection check results from gaia.
+  class ExternalCcResultFetcher : public GaiaAuthConsumer,

[Alexei Svitkine (slow), 2014/08/08 21:16:48]

Is there a reason this class is in the public section rather than in the private
section?

[Roger Tawa OOO till Jul 10th, 2014/08/09 15:58:28]

Yes for unit tests.

[Alexei Svitkine (slow), 2014/08/11 14:04:51]

Makes sense. Please add a line to the comment to mention this. "Declared in the
public section for unit tests."

[Roger Tawa OOO till Jul 10th, 2014/08/11 20:20:54]

Done.

+                                  public net::URLFetcherDelegate {
+   public:
+    // Maps connection URLs, as returned by StartGetCheckConnectionInfo() to
+    // token and URLFetcher used to fetch the URL.
+    typedef std::map<GURL, std::pair<std::string, net::URLFetcher*> >
+        URLToTokenAndFetcher;
+
+    // Maps tokens to the fetched result for that token.
+    typedef std::map<std::string, std::string> ResultMap;
+
+    ExternalCcResultFetcher(MergeSessionHelper* helper);
+    virtual ~ExternalCcResultFetcher();
+
+    // Gets the current value of the external connection check result string.
+    std::string GetExternalCcResult();
+
+    // Start fetching the external CC result.  If a fetch is already in progress
+    // it is canceled.
+    void Start();
+
+    // Are external URLs still being checked?
+    bool IsRunning();
+
+    // Returns a copy of the internal token to fetcher map.
+    URLToTokenAndFetcher get_fetcher_map_for_testing() {
+      return fetchers_;
+    }
+
+    // Simulate a timeout for tests.
+    void TimeoutForTests() {

[Alexei Svitkine (slow), 2014/08/08 21:16:48]

Nit: Non-trivial methods (those not using hacker_style) should be implemented
out of line.

[Roger Tawa OOO till Jul 10th, 2014/08/09 15:58:28]

It is trivial.

[Alexei Svitkine (slow), 2014/08/11 14:04:51]

I don't think it qualifiers per our style guide:

http://www.chromium.org/developers/coding-style#TOC-Inline-functions

[Roger Tawa OOO till Jul 10th, 2014/08/11 20:20:54]

Done.

+      Timeout();
+    }
+
+   private:
+    // Overridden from GaiaAuthConsumer.
+    virtual void OnGetCheckConnectionInfoSuccess(
+        const std::string& data) OVERRIDE;
+
+    // Creates and initializes a URL fetcher for doing a connection check.
+    net::URLFetcher* CreateFetcher(const GURL& url);
+
+    // Overridden from URLFetcherDelgate.
+    virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+
+    // Any fetches still ongoing after this call are considered timed out.
+    void Timeout();
+
+    void CleanupTransientState();
+
+    MergeSessionHelper* helper_;
+    base::OneShotTimer<ExternalCcResultFetcher> timer_;
+    scoped_ptr<GaiaAuthFetcher> gaia_auth_fetcher_;
+    URLToTokenAndFetcher fetchers_;
+    ResultMap results_;
+  };

[Alexei Svitkine (slow), 2014/08/08 21:16:48]

Nit: DISALLOW_COPY_AND_ASSIGN.

[Roger Tawa OOO till Jul 10th, 2014/08/09 15:58:28]

Done.

+
   MergeSessionHelper(OAuth2TokenService* token_service,
                      net::URLRequestContextGetter* request_context,
                      Observer* observer);
   virtual ~MergeSessionHelper();
 
   void LogIn(const std::string& account_id);
 
   // Add or remove observers of this helper.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ skipping 13 matching lines @@
 
   // Call observers when merge session completes.  This public so that callers
   // that know that a given account is already in the cookie jar can simply
   // inform the observers.
   void SignalComplete(const std::string& account_id,
                       const GoogleServiceAuthError& error);
 
   // Returns true of there are pending log ins or outs.
   bool is_running() const { return accounts_.size() > 0; }
 
+  // Start the process of fetching the external check connection result so that
+  // its ready when we try to perform a merge session.
+  void StartFetchingExternalCcResult();
+
+  // Returns true if the helper is still fetching external check connection
+  // results.
+  bool StillFetchingExternalCcResult();
+
  private:
+  net::URLRequestContextGetter* request_context() { return request_context_; }
+
   // Overridden from UbertokenConsumer.
   virtual void OnUbertokenSuccess(const std::string& token) OVERRIDE;
   virtual void OnUbertokenFailure(const GoogleServiceAuthError& error) OVERRIDE;
 
   // Overridden from GaiaAuthConsumer.
   virtual void OnMergeSessionSuccess(const std::string& data) OVERRIDE;
   virtual void OnMergeSessionFailure(const GoogleServiceAuthError& error)
       OVERRIDE;
 
   void LogOutInternal(const std::string& account_id,
                       const std::vector<std::string>& accounts);
 
   // Starts the proess of fetching the uber token and performing a merge session
   // for the next account.  Virtual so that it can be overriden in tests.
   virtual void StartFetching();
 
   // Virtual for testing purpose.
   virtual void StartLogOutUrlFetch();
 
   // Start the next merge session, if needed.
   void HandleNextAccount();
 
   // Overridden from URLFetcherDelgate.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   OAuth2TokenService* token_service_;
   net::URLRequestContextGetter* request_context_;
   scoped_ptr<GaiaAuthFetcher> gaia_auth_fetcher_;
   scoped_ptr<UbertokenFetcher> uber_token_fetcher_;
+  ExternalCcResultFetcher result_fetcher_;
 
   // A worklist for this class. Accounts names are stored here if
   // we are pending a signin action for that account. Empty strings
   // represent a signout request.
   std::deque<std::string> accounts_;
 
   // List of observers to notify when merge session completes.
   // Makes sure list is empty on destruction.
   ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(MergeSessionHelper);
 };
 
 #endif  // GOOGLE_APIS_GAIA_MERGE_SESSION_HELPER_H_