Revert 56423 - Added classes to enable session sync functionality....

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/histogram.h"
 #include "base/json/json_reader.h"
@@ skipping 88 matching lines @@
     return false;
   if (sync_autofill)
     data_types->insert(syncable::AUTOFILL);
 
   bool sync_extensions;
   if (!result->GetBoolean("syncExtensions", &sync_extensions))
     return false;
   if (sync_extensions)
     data_types->insert(syncable::EXTENSIONS);
 
-  bool sync_sessions;
-  if (!result->GetBoolean("syncSessions", &sync_sessions))
-    return false;
-  if (sync_sessions)
-    data_types->insert(syncable::SESSIONS);
-
   bool sync_typed_urls;
   if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls))
     return false;
   if (sync_typed_urls)
     data_types->insert(syncable::TYPED_URLS);
 
   bool sync_apps;
   if (!result->GetBoolean("syncApps", &sync_apps))
     return false;
   if (sync_apps)
@@ skipping 62 matching lines @@
   ExecuteJavascriptInIFrame(kLoginIFrameXPath, L"showGaiaSuccessAndClose();");
 }
 
 void FlowHandler::ShowGaiaSuccessAndSettingUp() {
   ExecuteJavascriptInIFrame(kLoginIFrameXPath,
                             L"showGaiaSuccessAndSettingUp();");
 }
 
 // Called by SyncSetupFlow::Advance.
 void FlowHandler::ShowChooseDataTypes(const DictionaryValue& args) {
+
   // If you're starting the wizard at the Choose Data Types screen (i.e. from
   // "Customize Sync"), this will be redundant.  However, if you're coming from
   // another wizard state, this will make sure Choose Data Types is on top.
   if (dom_ui_)
     dom_ui_->CallJavascriptFunction(L"showChooseDataTypes");
 
   std::string json;
   base::JSONWriter::Write(&args, false, &json);
   std::wstring javascript = std::wstring(L"setCheckboxesAndErrors") +
       L"(" + UTF8ToWide(json) + L");";
@@ skipping 152 matching lines @@
   args->SetBoolean("passwordsRegistered",
       registered_types.count(syncable::PASSWORDS) > 0);
   args->SetBoolean("autofillRegistered",
       registered_types.count(syncable::AUTOFILL) > 0);
   args->SetBoolean("extensionsRegistered",
       registered_types.count(syncable::EXTENSIONS) > 0);
   args->SetBoolean("typedUrlsRegistered",
       registered_types.count(syncable::TYPED_URLS) > 0);
   args->SetBoolean("appsRegistered",
       registered_types.count(syncable::APPS) > 0);
-  args->SetBoolean("sessionsRegistered",
-      registered_types.count(syncable::SESSIONS) > 0);
+
   args->SetBoolean("syncBookmarks",
       service->profile()->GetPrefs()->GetBoolean(prefs::kSyncBookmarks));
   args->SetBoolean("syncPreferences",
       service->profile()->GetPrefs()->GetBoolean(prefs::kSyncPreferences));
   args->SetBoolean("syncThemes",
       service->profile()->GetPrefs()->GetBoolean(prefs::kSyncThemes));
   args->SetBoolean("syncPasswords",
       service->profile()->GetPrefs()->GetBoolean(prefs::kSyncPasswords));
   args->SetBoolean("syncAutofill",
       service->profile()->GetPrefs()->GetBoolean(prefs::kSyncAutofill));
   args->SetBoolean("syncExtensions",
       service->profile()->GetPrefs()->GetBoolean(prefs::kSyncExtensions));
-  args->SetBoolean("syncSessions",
-      service->profile()->GetPrefs()->GetBoolean(prefs::kSyncSessions));
   args->SetBoolean("syncTypedUrls",
       service->profile()->GetPrefs()->GetBoolean(prefs::kSyncTypedUrls));
   args->SetBoolean("syncApps",
       service->profile()->GetPrefs()->GetBoolean(prefs::kSyncApps));
 }
 
 void SyncSetupFlow::GetDOMMessageHandlers(
     std::vector<DOMMessageHandler*>* handlers) const {
   handlers->push_back(flow_handler_);
   // We don't own flow_handler_ anymore, but it sticks around until at least
@@ skipping 119 matching lines @@
   Browser* b = BrowserList::GetLastActive();
   if (b) {
     b->BrowserShowHtmlDialog(flow, parent_window);
   } else {
     delete flow;
     return NULL;
   }
 #endif  // defined(OS_MACOSX)
   return flow;
 }