[Sync] Make SESSIONS an implicit type

chrome/browser/sync/sync_prefs_unittest.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/message_loop.h"
 #include "base/time.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 20 matching lines @@
 };
 
 // Returns all types visible from the setup UI.
 syncer::ModelTypeSet GetUserVisibleTypes() {
   syncer::ModelTypeSet user_visible_types(syncer::UserTypes());
   user_visible_types.Remove(syncer::APP_NOTIFICATIONS);
   user_visible_types.Remove(syncer::APP_SETTINGS);
   user_visible_types.Remove(syncer::AUTOFILL_PROFILE);
   user_visible_types.Remove(syncer::EXTENSION_SETTINGS);
   user_visible_types.Remove(syncer::SEARCH_ENGINES);
+  user_visible_types.Remove(syncer::SESSIONS);
+  user_visible_types.Remove(syncer::HISTORY_DELETE_DIRECTIVES);
   return user_visible_types;
 }
 
 TEST_F(SyncPrefsTest, Basic) {
   SyncPrefs sync_prefs(&pref_service_);
 
   EXPECT_FALSE(sync_prefs.HasSyncSetupCompleted());
   sync_prefs.SetSyncSetupCompleted();
   EXPECT_TRUE(sync_prefs.HasSyncSetupCompleted());
 
@@ skipping 58 matching lines @@
     if (it.Get() == syncer::PREFERENCES) {
       expected_preferred_types.Put(syncer::SEARCH_ENGINES);
     }
     if (it.Get() == syncer::APPS) {
       expected_preferred_types.Put(syncer::APP_NOTIFICATIONS);
       expected_preferred_types.Put(syncer::APP_SETTINGS);
     }
     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);
     }
-    // TODO(akalin): Remove this when history delete directives are
-    // registered by default.
-    if (it.Get() == syncer::HISTORY_DELETE_DIRECTIVES) {
-      expected_preferred_types.Clear();
+    if (it.Get() == syncer::TABS) {
+      expected_preferred_types.Put(syncer::SESSIONS);
     }
     sync_prefs.SetPreferredDataTypes(user_types, preferred_types);
     EXPECT_TRUE(expected_preferred_types.Equals(
         sync_prefs.GetPreferredDataTypes(user_types)));
   }
 }
 
 class MockSyncPrefObserver : public SyncPrefObserver {
  public:
   MOCK_METHOD1(OnSyncManagedPrefChange, void(bool));
@@ skipping 65 matching lines @@
   EXPECT_FALSE(sync_prefs.HasKeepEverythingSynced());
   const syncer::ModelTypeSet user_types = syncer::UserTypes();
   EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(user_types).Empty());
   EXPECT_FALSE(sync_prefs.IsManaged());
   EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());
 }
 
 }  // namespace
 
 }  // namespace browser_sync