Revert 254678 "sync: turn on deferred startup."

trunk/src/chrome/browser/sync/startup_controller.cc

Index: trunk/src/chrome/browser/sync/startup_controller.cc
===================================================================
--- trunk/src/chrome/browser/sync/startup_controller.cc	(revision 254811)
+++ trunk/src/chrome/browser/sync/startup_controller.cc	(working copy)
@@ -72,8 +72,8 @@
     start_up_time_ = base::Time::Now();
 
   if (deferred_option == STARTUP_BACKEND_DEFERRED &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSyncDisableDeferredStartup) &&
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kSyncEnableDeferredStartup) &&
       sync_prefs_->GetPreferredDataTypes(registered_types_)
           .Has(syncer::SESSIONS)) {
     if (first_start) {
@@ -152,8 +152,8 @@
 }
 
 void StartupController::OnFallbackStartupTimerExpired() {
-  DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kSyncDisableDeferredStartup));
+  DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kSyncEnableDeferredStartup));
 
   if (!start_backend_time_.is_null())
     return;
@@ -179,8 +179,8 @@
 }
 
 void StartupController::OnDataTypeRequestsSyncStartup(syncer::ModelType type) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSyncDisableDeferredStartup)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kSyncEnableDeferredStartup)) {
     DVLOG(2) << "Ignoring data type request for sync startup: "
              << syncer::ModelTypeToString(type);
     return;