Revert "Revert 182527" ([Sync] Make SESSIONS an implicit type)

chrome/browser/sync/sync_prefs_unittest.cc

Index: chrome/browser/sync/sync_prefs_unittest.cc
diff --git a/chrome/browser/sync/sync_prefs_unittest.cc b/chrome/browser/sync/sync_prefs_unittest.cc
index aa19c1a1a37375ab2e1cc1b741e2768504dfa7f4..ad0067a814929e6ba8a29c160e6b9c772fddc674 100644
--- a/chrome/browser/sync/sync_prefs_unittest.cc
+++ b/chrome/browser/sync/sync_prefs_unittest.cc
@@ -4,8 +4,10 @@
 
 #include "chrome/browser/sync/sync_prefs.h"
 
+#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/time.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -21,6 +23,8 @@ using ::testing::StrictMock;
 class SyncPrefsTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        switches::kHistoryEnableFullHistorySync);
     SyncPrefs::RegisterUserPrefs(pref_service_.registry());
   }
 
@@ -106,8 +110,14 @@ TEST_F(SyncPrefsTest, PreferredTypesNotKeepEverythingSynced) {
     if (it.Get() == syncer::EXTENSIONS) {
       expected_preferred_types.Put(syncer::EXTENSION_SETTINGS);
     }
-    if (it.Get() == syncer::SESSIONS) {
+    if (it.Get() == syncer::TYPED_URLS) {
       expected_preferred_types.Put(syncer::HISTORY_DELETE_DIRECTIVES);
+      expected_preferred_types.Put(syncer::SESSIONS);
+      expected_preferred_types.Put(syncer::FAVICON_IMAGES);
+      expected_preferred_types.Put(syncer::FAVICON_TRACKING);
+    }
+    if (it.Get() == syncer::PROXY_TABS) {
+      expected_preferred_types.Put(syncer::SESSIONS);
       expected_preferred_types.Put(syncer::FAVICON_IMAGES);
       expected_preferred_types.Put(syncer::FAVICON_TRACKING);
     }