| OLD | NEW | 
|---|
| 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/test/integration/sync_test.h" | 5 #include "chrome/browser/sync/test/integration/sync_test.h" | 
| 6 | 6 | 
| 7 #include "chrome/browser/sync/profile_sync_service_harness.h" | 7 #include "chrome/browser/sync/profile_sync_service_harness.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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 106     } | 106     } | 
| 107   } | 107   } | 
| 108 | 108 | 
| 109   for (syncer::ModelTypeSet::Iterator it = registered_types.First(); | 109   for (syncer::ModelTypeSet::Iterator it = registered_types.First(); | 
| 110        it.Good(); it.Inc()) { | 110        it.Good(); it.Inc()) { | 
| 111     ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get())); | 111     ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get())); | 
| 112 | 112 | 
| 113     // AUTOFILL_PROFILE is lumped together with AUTOFILL. | 113     // AUTOFILL_PROFILE is lumped together with AUTOFILL. | 
| 114     // SESSIONS is lumped together with PROXY_TABS and | 114     // SESSIONS is lumped together with PROXY_TABS and | 
| 115     // HISTORY_DELETE_DIRECTIVES. | 115     // HISTORY_DELETE_DIRECTIVES. | 
| 116     if (it.Get() == syncer::AUTOFILL_PROFILE || it.Get() == syncer::SESSIONS) { | 116     // PRIORITY_PREFERENCES is lumped together with PREFERENCES. | 
|  | 117     if (it.Get() == syncer::AUTOFILL_PROFILE || it.Get() == syncer::SESSIONS || | 
|  | 118         it.Get() == syncer::PRIORITY_PREFERENCES) { | 
| 117       continue; | 119       continue; | 
| 118     } | 120     } | 
| 119 | 121 | 
| 120     syncer::UserShare* user_share = | 122     syncer::UserShare* user_share = | 
| 121         GetClient(0)->service()->GetUserShare(); | 123         GetClient(0)->service()->GetUserShare(); | 
| 122 | 124 | 
| 123     ASSERT_FALSE(DoesTopLevelNodeExist(user_share, it.Get())) | 125     ASSERT_FALSE(DoesTopLevelNodeExist(user_share, it.Get())) | 
| 124         << syncer::ModelTypeToString(it.Get()); | 126         << syncer::ModelTypeToString(it.Get()); | 
| 125 | 127 | 
| 126     // AUTOFILL_PROFILE is lumped together with AUTOFILL. | 128     // AUTOFILL_PROFILE is lumped together with AUTOFILL. | 
| 127     if (it.Get() == syncer::AUTOFILL) { | 129     if (it.Get() == syncer::AUTOFILL) { | 
| 128       ASSERT_FALSE(DoesTopLevelNodeExist(user_share, | 130       ASSERT_FALSE(DoesTopLevelNodeExist(user_share, | 
| 129                                          syncer::AUTOFILL_PROFILE)); | 131                                          syncer::AUTOFILL_PROFILE)); | 
| 130     } else if (it.Get() == syncer::HISTORY_DELETE_DIRECTIVES || | 132     } else if (it.Get() == syncer::HISTORY_DELETE_DIRECTIVES || | 
| 131                it.Get() == syncer::PROXY_TABS) { | 133                it.Get() == syncer::PROXY_TABS) { | 
| 132       ASSERT_FALSE(DoesTopLevelNodeExist(user_share, | 134       ASSERT_FALSE(DoesTopLevelNodeExist(user_share, | 
| 133                                          syncer::SESSIONS)); | 135                                          syncer::SESSIONS)); | 
|  | 136     } else if (it.Get() == syncer::PREFERENCES) { | 
|  | 137       ASSERT_FALSE(DoesTopLevelNodeExist(user_share, | 
|  | 138                                          syncer::PRIORITY_PREFERENCES)); | 
| 134     } | 139     } | 
| 135   } | 140   } | 
| 136 | 141 | 
| 137   EnableNotifications(); | 142   EnableNotifications(); | 
| 138 } | 143 } | 
| 139 | 144 | 
| 140 }  // namespace | 145 }  // namespace | 
| OLD | NEW | 
|---|