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

chrome/browser/sync/engine/auth_watcher.h

 // 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.
 //
 // AuthWatcher watches authentication events and user open and close
 // events and accordingly opens and closes shares.
 
 #ifndef CHROME_BROWSER_SYNC_ENGINE_AUTH_WATCHER_H_
 #define CHROME_BROWSER_SYNC_ENGINE_AUTH_WATCHER_H_
 
@@ skipping 88 matching lines @@
   bool LoadDirectoryListAndOpen(const PathString& login);
 
   typedef EventChannel<AuthWatcherEvent, Lock> Channel;
 
   inline Channel* channel() const {
     return channel_.get();
   }
 
   // The following 3 flavors of authentication routines are asynchronous and can
   // be called from any thread.
+  // If |captcha_value| is specified but |captcha_token| is not, this will
+  // attempt authentication using the last observed captcha token out of
+  // convenience in the common case so the token doesn't have to be plumbed
+  // everywhere.
   void Authenticate(const std::string& email, const std::string& password,
       const std::string& captcha_token, const std::string& captcha_value,
       bool persist_creds_to_disk);
 
   void Authenticate(const std::string& email, const std::string& password,
       bool persist_creds_to_disk) {
     Authenticate(email, password, "", "", persist_creds_to_disk);
   }
 
   // Use this version when you don't need the gaia authentication step because
@@ skipping 45 matching lines @@
       mail.push_back('@');
       // TODO(chron): Should this be done only at the UI level?
       mail.append(DEFAULT_SIGNIN_DOMAIN);
     }
     return mail;
   }
 
   // A struct to marshal various data across to the auth_backend_thread_ on
   // Authenticate() and AuthenticateWithToken calls.
   struct AuthRequest {
-      std::string email;
-      std::string password;
-      std::string auth_token;
-      std::string captcha_token;
-      std::string captcha_value;
-      bool persist_creds_to_disk;
-      AuthWatcherEvent::AuthenticationTrigger trigger;
+    std::string email;
+    std::string password;
+    std::string auth_token;
+    std::string captcha_token;
+    std::string captcha_value;
+    bool persist_creds_to_disk;
+    AuthWatcherEvent::AuthenticationTrigger trigger;
   };
 
   // The public interface Authenticate methods are proxies to these, which
   // can only be called from |auth_backend_thread_|.
   void DoAuthenticate(const AuthRequest& request);
   void DoAuthenticateWithToken(const std::string& email,
                                const std::string& auth_token);
 
   // The public HandleServerConnectionEvent method proxies to this method, which
   // can only be called on |auth_backend_thread_|.
@@ skipping 13 matching lines @@
 
   base::Thread auth_backend_thread_;
 
   AuthWatcherEvent::AuthenticationTrigger current_attempt_trigger_;
   DISALLOW_COPY_AND_ASSIGN(AuthWatcher);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_AUTH_WATCHER_H_