Index: chrome/browser/sync/sync_prefs.cc |
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc |
index ae25f7fbe2527c58c05b312bd013d58e5c8889eb..a26618e0f1bf6a9da5dc2b40c321e519d1902d95 100644 |
--- a/chrome/browser/sync/sync_prefs.cc |
+++ b/chrome/browser/sync/sync_prefs.cc |
@@ -415,12 +415,9 @@ void SyncPrefs::RegisterPrefGroups() { |
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 !kDisableFu
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); |