Fix syncing of sessions. Numerous changes have been made. Currently, the mode...

chrome/browser/sync/sync_setup_flow.cc

 // Copyright (c) 2010 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_util.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 110 matching lines @@
     return false;
   if (sync_extensions)
     config->data_types.insert(syncable::EXTENSIONS);
 
   bool sync_typed_urls;
   if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls))
     return false;
   if (sync_typed_urls)
     config->data_types.insert(syncable::TYPED_URLS);
 
+  bool sync_sessions;
+  if (!result->GetBoolean("syncSessions", &sync_sessions))
+    return false;
+  if (sync_sessions)
+    config->data_types.insert(syncable::SESSIONS);
+
   bool sync_apps;
   if (!result->GetBoolean("syncApps", &sync_apps))
     return false;
   if (sync_apps)
     config->data_types.insert(syncable::APPS);
 
   // Encyption settings.
   if (!result->GetBoolean("usePassphrase", &config->use_secondary_passphrase))
     return false;
 
@@ skipping 528 matching lines @@
 
 void SyncSetupFlow::OnPassphraseEntry(const std::string& passphrase) {
   if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) {
     service_->SetSecondaryPassphrase(passphrase);
     Advance(SyncSetupWizard::SETTING_UP);
   } else if (configuration_pending_) {
     configuration_.secondary_passphrase = passphrase;
     OnConfigurationComplete();
   }
 }