Abort check external connections quickly on failure, instead of waiting

for timeout.

BUG=

Review URL: https://codereview.chromium.org/704263002

Cr-Commit-Position: refs/heads/master@{#303082}

2 files changed, 9 insertions, 0 deletions

diff --git a/google_apis/gaia/merge_session_helper.cc b/google_apis/gaia/merge_session_helper.cc
index ded287c..2137b14 100644
--- a/google_apis/gaia/merge_session_helper.cc
+++ b/google_apis/gaia/merge_session_helper.cc
@@ -99,6 +99,13 @@ MergeSessionHelper::ExternalCcResultFetcher::OnGetCheckConnectionInfoSuccess(
   }
 }
 
+void
+MergeSessionHelper::ExternalCcResultFetcher::OnGetCheckConnectionInfoError(
+    const GoogleServiceAuthError& error) {
+  CleanupTransientState();
+  FireGetCheckConnectionInfoCompleted(false);
+}
+
 net::URLFetcher* MergeSessionHelper::ExternalCcResultFetcher::CreateFetcher(
     const GURL& url) {
   net::URLFetcher* fetcher = net::URLFetcher::Create(
diff --git a/google_apis/gaia/merge_session_helper.h b/google_apis/gaia/merge_session_helper.h
index 324bb40..91ca48b 100644
--- a/google_apis/gaia/merge_session_helper.h
+++ b/google_apis/gaia/merge_session_helper.h
@@ -87,6 +87,8 @@ class MergeSessionHelper : public GaiaAuthConsumer,
    private:
     // Overridden from GaiaAuthConsumer.
     void OnGetCheckConnectionInfoSuccess(const std::string& data) override;
+    void OnGetCheckConnectionInfoError(
+        const GoogleServiceAuthError& error) override;
 
     // Creates and initializes a URL fetcher for doing a connection check.
     net::URLFetcher* CreateFetcher(const GURL& url);