Implement the gaia captcha state and unlock capability in the sync setup wiza...

chrome/browser/sync/engine/auth_watcher.cc

 // Copyright (c) 2006-2009 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 "chrome/browser/sync/engine/auth_watcher.h"
 
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/sync/engine/all_status.h"
 #include "chrome/browser/sync/engine/authenticator.h"
@@ skipping 199 matching lines @@
   AuthWatcherEvent event = { AuthWatcherEvent::AUTHENTICATION_ATTEMPT_START };
   NotifyListeners(&event);
 
   current_attempt_trigger_ = request.trigger;
 
   SaveCredentials save = request.persist_creds_to_disk ?
       PERSIST_TO_DISK : SAVE_IN_MEMORY_ONLY;
   SignIn const signin = user_settings_->
       RecallSigninType(request.email, GMAIL_SIGNIN);
 
+  // We let the caller be lazy and try using the last captcha token seen by
+  // the gaia authenticator if they haven't provided a token but have sent
+  // a challenge response. Of course, if the captcha token is specified,
+  // we use that one instead.
+  std::string captcha_token(request.captcha_token);
+  if (!request.captcha_value.empty() && captcha_token.empty())
+    captcha_token = gaia_->captcha_token();
+
   if (!request.password.empty()) {
     bool authenticated = false;
-    if (!request.captcha_token.empty() && !request.captcha_value.empty()) {
+    if (!captcha_token.empty()) {
       authenticated = gaia_->Authenticate(request.email, request.password,
-                                          save, request.captcha_token,
+                                          save, captcha_token,
                                           request.captcha_value, signin);
     } else {
       authenticated = gaia_->Authenticate(request.email, request.password,
                                           save, signin);
     }
     if (authenticated) {
       PersistCredentials();
       DoAuthenticateWithToken(gaia_->email(), gaia_->auth_token());
     } else {
       ProcessGaiaAuthFailure();
@@ skipping 91 matching lines @@
 string AuthWatcher::email() const {
   return gaia_->email();
 }
 
 void AuthWatcher::NotifyListeners(AuthWatcherEvent* event) {
   event->trigger = current_attempt_trigger_;
   channel_->NotifyListeners(*event);
 }
 
 }  // namespace browser_sync