Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(724)

Side by Side Diff: chrome/browser/sync/test/integration/enable_disable_test.cc

Issue 694903002: [Sync] Device info should be enabled by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | components/sync_driver/sync_prefs.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
7 #include "chrome/browser/sync/test/integration/sync_test.h" 7 #include "chrome/browser/sync/test/integration/sync_test.h"
8 #include "sync/internal_api/public/base/model_type.h" 8 #include "sync/internal_api/public/base/model_type.h"
9 #include "sync/internal_api/public/read_node.h" 9 #include "sync/internal_api/public/read_node.h"
10 #include "sync/internal_api/public/read_transaction.h" 10 #include "sync/internal_api/public/read_transaction.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 for (syncer::ModelTypeSet::Iterator it = registered_types.First(); 106 for (syncer::ModelTypeSet::Iterator it = registered_types.First();
107 it.Good(); it.Inc()) { 107 it.Good(); it.Inc()) {
108 // SUPERVISED_USERS and SUPERVISED_USER_SHARED_SETTINGS are always synced. 108 // SUPERVISED_USERS and SUPERVISED_USER_SHARED_SETTINGS are always synced.
109 if (it.Get() == syncer::SUPERVISED_USERS || 109 if (it.Get() == syncer::SUPERVISED_USERS ||
110 it.Get() == syncer::SUPERVISED_USER_SHARED_SETTINGS || 110 it.Get() == syncer::SUPERVISED_USER_SHARED_SETTINGS ||
111 it.Get() == syncer::SYNCED_NOTIFICATIONS || 111 it.Get() == syncer::SYNCED_NOTIFICATIONS ||
112 it.Get() == syncer::SYNCED_NOTIFICATION_APP_INFO) 112 it.Get() == syncer::SYNCED_NOTIFICATION_APP_INFO)
113 continue; 113 continue;
114 114
115 // Device info cannot be disabled.
116 if (it.Get() == syncer::DEVICE_INFO)
117 continue;
118
115 ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get())); 119 ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get()));
116 120
117 // AUTOFILL_PROFILE is lumped together with AUTOFILL. 121 // AUTOFILL_PROFILE is lumped together with AUTOFILL.
118 // SESSIONS is lumped together with PROXY_TABS and TYPED_URLS. 122 // SESSIONS is lumped together with PROXY_TABS and TYPED_URLS.
119 // HISTORY_DELETE_DIRECTIVES is lumped together with TYPED_URLS. 123 // HISTORY_DELETE_DIRECTIVES is lumped together with TYPED_URLS.
120 // PRIORITY_PREFERENCES is lumped together with PREFERENCES. 124 // PRIORITY_PREFERENCES is lumped together with PREFERENCES.
121 // Favicons are lumped together with PROXY_TABS and 125 // Favicons are lumped together with PROXY_TABS and
122 // HISTORY_DELETE_DIRECTIVES. 126 // HISTORY_DELETE_DIRECTIVES.
123 if (it.Get() == syncer::AUTOFILL_PROFILE || 127 if (it.Get() == syncer::AUTOFILL_PROFILE ||
124 it.Get() == syncer::SESSIONS || 128 it.Get() == syncer::SESSIONS ||
(...skipping 24 matching lines...) Expand all
149 ASSERT_EQ(GetClient(0)->IsTypePreferred(syncer::TYPED_URLS), 153 ASSERT_EQ(GetClient(0)->IsTypePreferred(syncer::TYPED_URLS),
150 DoesTopLevelNodeExist(user_share, syncer::SESSIONS)); 154 DoesTopLevelNodeExist(user_share, syncer::SESSIONS));
151 } else if (it.Get() == syncer::PREFERENCES) { 155 } else if (it.Get() == syncer::PREFERENCES) {
152 ASSERT_FALSE(DoesTopLevelNodeExist(user_share, 156 ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
153 syncer::PRIORITY_PREFERENCES)); 157 syncer::PRIORITY_PREFERENCES));
154 } 158 }
155 } 159 }
156 } 160 }
157 161
158 } // namespace 162 } // namespace
OLDNEW
« no previous file with comments | « no previous file | components/sync_driver/sync_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698