Respect the new Online Wallet sign-in response.

components/autofill/content/browser/wallet/wallet_signin_helper.cc

 // Copyright 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.
 
 #include "components/autofill/content/browser/wallet/wallet_signin_helper.h"
 
 #include "base/callback_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 196 matching lines @@
     return;
   }
 
   switch (state_) {
     case USERNAME_FETCHING_USERINFO:  /*FALLTHROUGH*/
     case PASSIVE_FETCHING_USERINFO:
       ProcessGetAccountInfoResponseAndFinish();
       break;
 
     case PASSIVE_EXECUTING_SIGNIN:
-      url_fetcher_.reset();
-      state_ = PASSIVE_FETCHING_USERINFO;
-      StartFetchingUserNameFromSession();
+      ProcessPassiveSignInResponseAndFetchUserName();
       break;
 
     case AUTOMATIC_EXECUTING_SIGNIN:
-      state_ = IDLE;
-      url_fetcher_.reset();
-      delegate_->OnAutomaticSigninSuccess(username_);
+      ProcessAutomaticSignInResponseAndFinish();
       break;
 
     default:
       NOTREACHED() << "unexpected state_=" << state_;
   }
 }
 
 void WalletSigninHelper::StartFetchingUserNameFromSession() {
   DCHECK(!gaia_fetcher_);
   const int random_number = static_cast<int>(base::RandUint64() % INT_MAX);
   url_fetcher_.reset(
       net::URLFetcher::Create(
           0,
           GURL(base::StringPrintf(kGetAccountInfoUrlFormat, random_number)),
           net::URLFetcher::GET,
           this));
   url_fetcher_->SetRequestContext(getter_);
   url_fetcher_->Start();  // This will result in OnURLFetchComplete callback.
 }
 
+void WalletSigninHelper::ProcessPassiveSignInResponseAndFetchUserName() {
+  GoogleServiceAuthError error(GoogleServiceAuthError::AuthErrorNone());
+  if (!ParsePassiveSignInResponse(&error)) {
+    OnServiceError(error);
+    return;
+  }
+
+  url_fetcher_.reset();
+  state_ = PASSIVE_FETCHING_USERINFO;
+  StartFetchingUserNameFromSession();
+}
+
+void WalletSigninHelper::ProcessAutomaticSignInResponseAndFinish() {
+  GoogleServiceAuthError error(GoogleServiceAuthError::AuthErrorNone());
+  if (!ParsePassiveSignInResponse(&error)) {
+    OnServiceError(error);
+    return;
+  }
+
+  url_fetcher_.reset();
+  state_ = IDLE;
+  delegate_->OnAutomaticSigninSuccess(username_);
+}
+
 void WalletSigninHelper::ProcessGetAccountInfoResponseAndFinish() {
   std::string email;
   if (!ParseGetAccountInfoResponse(url_fetcher_.get(), &email)) {
     LOG(ERROR) << "failed to get the user email";
     OnOtherError();
     return;
   }
 
   username_ = email;
   const State finishing_state = state_;
@@ skipping 31 matching lines @@
 
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   if (!dict->GetStringWithoutPathExpansion("email", email)) {
     LOG(ERROR) << "no email in JSON response";
     return false;
   }
 
   return !email->empty();
 }
 
+bool WalletSigninHelper::ParsePassiveSignInResponse(
+    GoogleServiceAuthError* error) {

[ahutter, 2013/06/13 23:52:10]

Should you DCHECK(error)?

[aruslan, 2013/06/18 21:21:47]

Done.

+  std::string data;
+  if (!url_fetcher_->GetResponseAsString(&data)) {
+    LOG(ERROR) << "failed to GetResponseAsString";
+    *error = GoogleServiceAuthError::AuthErrorNone();
+    return false;
+  }
+
+  if (data != "YES") {
+    *error =
+        GoogleServiceAuthError(GoogleServiceAuthError::USER_NOT_SIGNED_UP);
+    return false;
+  }
+
+  return true;
+}
+
 }  // namespace wallet
 }  // namespace autofill