Chromium Code Reviews| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 47 // TODO(rlarocque, 97780): It should be possible to disable notifications | 47 // TODO(rlarocque, 97780): It should be possible to disable notifications |
| 48 // before calling SetupSync(). We should move this line back to the top | 48 // before calling SetupSync(). We should move this line back to the top |
| 49 // of this function when this is supported. | 49 // of this function when this is supported. |
| 50 DisableNotifications(); | 50 DisableNotifications(); |
| 51 | 51 |
| 52 const syncer::ModelTypeSet registered_types = | 52 const syncer::ModelTypeSet registered_types = |
| 53 GetClient(0)->service()->GetRegisteredDataTypes(); | 53 GetClient(0)->service()->GetRegisteredDataTypes(); |
| 54 syncer::UserShare* user_share = GetClient(0)->service()->GetUserShare(); | 54 syncer::UserShare* user_share = GetClient(0)->service()->GetUserShare(); |
| 55 for (syncer::ModelTypeSet::Iterator it = registered_types.First(); | 55 for (syncer::ModelTypeSet::Iterator it = registered_types.First(); |
| 56 it.Good(); it.Inc()) { | 56 it.Good(); it.Inc()) { |
| 57 if (syncer::LocalTypes().Has(it.Get())) | |
|
tim (not reviewing)
2013/01/18 20:56:33
Shouldn't we also cover enabling virtual types?
Nicolas Zea
2013/01/19 00:03:13
Hmm, yeah. Should probably just special case tabs
| |
| 58 continue; | |
| 57 ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get())); | 59 ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get())); |
| 58 | 60 |
| 59 // AUTOFILL_PROFILE is lumped together with AUTOFILL. | 61 // AUTOFILL_PROFILE is lumped together with AUTOFILL. |
| 60 if (it.Get() == syncer::AUTOFILL_PROFILE) { | 62 if (it.Get() == syncer::AUTOFILL_PROFILE) { |
| 61 continue; | 63 continue; |
| 62 } | 64 } |
| 63 | 65 |
| 64 ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get())) | 66 ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get())) |
| 65 << syncer::ModelTypeToString(it.Get()); | 67 << syncer::ModelTypeToString(it.Get()); |
| 66 | 68 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 115 if (it.Get() == syncer::AUTOFILL) { | 117 if (it.Get() == syncer::AUTOFILL) { |
| 116 ASSERT_FALSE(DoesTopLevelNodeExist(user_share, | 118 ASSERT_FALSE(DoesTopLevelNodeExist(user_share, |
| 117 syncer::AUTOFILL_PROFILE)); | 119 syncer::AUTOFILL_PROFILE)); |
| 118 } | 120 } |
| 119 } | 121 } |
| 120 | 122 |
| 121 EnableNotifications(); | 123 EnableNotifications(); |
| 122 } | 124 } |
| 123 | 125 |
| 124 } // namespace | 126 } // namespace |
| OLD | NEW |