Sync: Turn on full history sync by default.

chrome/browser/sync/sync_prefs.cc

 // Copyright (c) 2012 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_prefs.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
@@ skipping 397 matching lines @@
 
   pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_PROFILE);
 
   pref_groups_[syncer::EXTENSIONS].Put(syncer::EXTENSION_SETTINGS);
 
   pref_groups_[syncer::PREFERENCES].Put(syncer::DICTIONARY);
   pref_groups_[syncer::PREFERENCES].Put(syncer::PRIORITY_PREFERENCES);
   pref_groups_[syncer::PREFERENCES].Put(syncer::SEARCH_ENGINES);
 
   pref_groups_[syncer::TYPED_URLS].Put(syncer::HISTORY_DELETE_DIRECTIVES);
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kHistoryEnableFullHistorySync)) {
-    pref_groups_[syncer::TYPED_URLS].Put(syncer::SESSIONS);
-    pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_IMAGES);
-    pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_TRACKING);
-  }
+  pref_groups_[syncer::TYPED_URLS].Put(syncer::SESSIONS);

[Nicolas Zea, 2013/04/18 17:43:35]

I think we should have this guarded by !kDisableFullHistorySync. We shouldn't be
enabling sessions with typed urls if history delete directives are not enabled.

[Patrick Dubroy, 2013/04/19 09:58:09]

Done.

+  pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_IMAGES);
+  pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_TRACKING);
 
   pref_groups_[syncer::PROXY_TABS].Put(syncer::SESSIONS);
   pref_groups_[syncer::PROXY_TABS].Put(syncer::FAVICON_IMAGES);
   pref_groups_[syncer::PROXY_TABS].Put(syncer::FAVICON_TRACKING);
 
   // TODO(zea): put favicons in the bookmarks group as well once it handles
   // those favicons.
 }
 
 // static
@@ skipping 50 matching lines @@
   for (PrefGroupsMap::const_iterator i = pref_groups_.begin();
       i != pref_groups_.end(); ++i) {
     if (types.Has(i->first))
       types_with_groups.PutAll(i->second);
   }
   types_with_groups.RetainAll(registered_types);
   return types_with_groups;
 }
 
 }  // namespace browser_sync