Sync: Turn on full history sync by default.

chrome/browser/sync/test/integration/enable_disable_test.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/test/integration/sync_test.h"
 
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
@@ skipping 93 matching lines @@
     if (!syncer::ProxyTypes().Has(it.Get())) {
       ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()));
     }
   }
 
   for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
     ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    // SESSIONS is lumped together with PROXY_TABS and
-    // HISTORY_DELETE_DIRECTIVES.
+    // SESSIONS is lumped together with PROXY_TABS and TYPED_URLS.
+    // HISTORY_DELETE_DIRECTIVES is lumped together with TYPED_URLS.
     // PRIORITY_PREFERENCES is lumped together with PREFERENCES.
-    if (it.Get() == syncer::AUTOFILL_PROFILE || it.Get() == syncer::SESSIONS ||
+    if (it.Get() == syncer::AUTOFILL_PROFILE ||
+        it.Get() == syncer::SESSIONS ||
+        it.Get() == syncer::HISTORY_DELETE_DIRECTIVES ||
         it.Get() == syncer::PRIORITY_PREFERENCES) {
       continue;
     }
 
     syncer::UserShare* user_share =
         GetClient(0)->service()->GetUserShare();
 
     ASSERT_FALSE(DoesTopLevelNodeExist(user_share, it.Get()))
         << syncer::ModelTypeToString(it.Get());
 
-    // AUTOFILL_PROFILE is lumped together with AUTOFILL.
     if (it.Get() == syncer::AUTOFILL) {
+      // AUTOFILL_PROFILE is lumped together with AUTOFILL.
+      ASSERT_FALSE(DoesTopLevelNodeExist(user_share, syncer::AUTOFILL_PROFILE));
+    } else if (it.Get() == syncer::TYPED_URLS) {
       ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
-                                         syncer::AUTOFILL_PROFILE));
-    } else if (it.Get() == syncer::HISTORY_DELETE_DIRECTIVES ||
-               it.Get() == syncer::PROXY_TABS) {
-      ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
-                                         syncer::SESSIONS));
+                                         syncer::HISTORY_DELETE_DIRECTIVES));
+      // SESSIONS should be enabled only if PROXY_TABS is.
+      ASSERT_EQ(GetClient(0)->IsTypePreferred(syncer::PROXY_TABS),
+                DoesTopLevelNodeExist(user_share, syncer::SESSIONS));
+    } else if (it.Get() == syncer::PROXY_TABS) {
+      // SESSIONS should be enabled only if TYPED_URLS is.
+      ASSERT_EQ(GetClient(0)->IsTypePreferred(syncer::TYPED_URLS),
+                DoesTopLevelNodeExist(user_share, syncer::SESSIONS));
     } else if (it.Get() == syncer::PREFERENCES) {
       ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
                                          syncer::PRIORITY_PREFERENCES));
     }
   }
 
   EnableNotifications();
 }
 
 }  // namespace