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

chrome/browser/sync/sync_setup_flow.cc

 // Copyright (c) 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/sync_setup_flow.h"
 
 #include "app/gfx/font.h"
 #include "app/gfx/font_util.h"
 #include "base/histogram.h"
 #include "base/json/json_reader.h"
@@ skipping 37 matching lines @@
   return result;
 }
 
 void FlowHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback("SubmitAuth",
       NewCallback(this, &FlowHandler::HandleSubmitAuth));
   dom_ui_->RegisterMessageCallback("SubmitMergeAndSync",
       NewCallback(this, &FlowHandler::HandleSubmitMergeAndSync));
 }
 
-static bool GetUsernameAndPassword(const std::string& json,
-    std::string* username, std::string* password) {
+static bool GetAuthData(const std::string& json,
+    std::string* username, std::string* password, std::string* captcha) {
   scoped_ptr<Value> parsed_value(base::JSONReader::Read(json, false));
   if (!parsed_value.get() || !parsed_value->IsType(Value::TYPE_DICTIONARY))
     return false;
 
   DictionaryValue* result = static_cast<DictionaryValue*>(parsed_value.get());
   if (!result->GetString(L"user", username) ||
-      !result->GetString(L"pass", password)) {
+      !result->GetString(L"pass", password) ||
+      !result->GetString(L"captcha", captcha)) {
       return false;
   }
   return true;
 }
 
 void FlowHandler::HandleSubmitAuth(const Value* value) {
   std::string json(GetJsonResponse(value));
-  std::string username, password;
+  std::string username, password, captcha;
   if (json.empty())
     return;
 
-  if (!GetUsernameAndPassword(json, &username, &password)) {
+  if (!GetAuthData(json, &username, &password, &captcha)) {
     // The page sent us something that we didn't understand.
     // This probably indicates a programming error.
     NOTREACHED();
     return;
   }
 
   if (flow_)
-    flow_->OnUserSubmittedAuth(username, password);
+    flow_->OnUserSubmittedAuth(username, password, captcha);
 }
 
 void FlowHandler::HandleSubmitMergeAndSync(const Value* value) {
   if (flow_)
     flow_->OnUserAcceptedMergeAndSync();
 }
 
 // Called by SyncSetupFlow::Advance.
 void FlowHandler::ShowGaiaLogin(const DictionaryValue& args) {
   std::string json;
@@ skipping 119 matching lines @@
                                         DictionaryValue* args) {
   const GoogleServiceAuthError& error = service->GetAuthError();
   if (!service->last_attempted_user_email().empty()) {
     args->SetString(L"user", service->last_attempted_user_email());
     args->SetInteger(L"error", error.state());
   } else {
     std::wstring user(UTF16ToWide(service->GetAuthenticatedUsername()));
     args->SetString(L"user", user);
     args->SetInteger(L"error", user.empty() ? 0 : error.state());
   }
+
+  args->SetString(L"captchaUrl", error.captcha().image_url.spec());
 }
 
 void SyncSetupFlow::GetDOMMessageHandlers(
     std::vector<DOMMessageHandler*>* handlers) const {
   handlers->push_back(flow_handler_);
 }
 
 bool SyncSetupFlow::ShouldAdvance(SyncSetupWizard::State state) {
   switch (state) {
     case SyncSetupWizard::GAIA_LOGIN:
@@ skipping 66 matching lines @@
   if (!b)
     return NULL;
 
   FlowHandler* handler = new FlowHandler();
   SyncSetupFlow* flow = new SyncSetupFlow(start, end, json_args,
       container, handler, service);
   handler->set_flow(flow);
   b->BrowserShowHtmlDialog(flow, NULL);
   return flow;
 }