Add support for the "clear pending" server / storage backend state.

BUG=46807
TEST=SyncerThreadWithSyncerTest, SyncSetupWizardTest, SyncerProtoUtilTest

Review URL: http://codereview.chromium.org/2976011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52502 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 1 deletions

diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index 769d4b0..b1063bb 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -191,7 +191,7 @@ void FlowHandler::ShowChooseDataTypes(const DictionaryValue& args) {
 
   std::string json;
   base::JSONWriter::Write(&args, false, &json);
-  std::wstring javascript = std::wstring(L"setChooseDataTypesCheckboxes") +
+  std::wstring javascript = std::wstring(L"setCheckboxesAndErrors") +
       L"(" + UTF8ToWide(json) + L");";
   ExecuteJavascriptInIFrame(kChooseDataTypesIFrameXPath, javascript);
 }
@@ -385,6 +385,8 @@ bool SyncSetupFlow::ShouldAdvance(SyncSetupWizard::State state) {
       return current_state_ == SyncSetupWizard::GAIA_LOGIN;
     case SyncSetupWizard::CHOOSE_DATA_TYPES:
       return current_state_ == SyncSetupWizard::GAIA_SUCCESS;
+    case SyncSetupWizard::SETUP_ABORTED_BY_PENDING_CLEAR:
+      return current_state_ == SyncSetupWizard::CHOOSE_DATA_TYPES;
     case SyncSetupWizard::FATAL_ERROR:
       return true;  // You can always hit the panic button.
     case SyncSetupWizard::DONE_FIRST_TIME:
@@ -420,6 +422,13 @@ void SyncSetupFlow::Advance(SyncSetupWizard::State advance_state) {
       flow_handler_->ShowChooseDataTypes(args);
       break;
     }
+    case SyncSetupWizard::SETUP_ABORTED_BY_PENDING_CLEAR: {
+      DictionaryValue args;
+      SyncSetupFlow::GetArgsForChooseDataTypes(service_, &args);
+      args.SetBoolean(L"was_aborted", true);
+      flow_handler_->ShowChooseDataTypes(args);
+      break;
+    }
     case SyncSetupWizard::FATAL_ERROR: {
       // This shows the user the "Could not connect to server" error.
       // TODO(sync): Update this error messaging.