| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 datatypes.push_back(syncer::FAVICON_TRACKING); | 63 datatypes.push_back(syncer::FAVICON_TRACKING); |
| 64 datatypes.push_back(syncer::FAVICON_IMAGES); | 64 datatypes.push_back(syncer::FAVICON_IMAGES); |
| 65 datatypes.push_back(syncer::SYNCED_NOTIFICATIONS); | 65 datatypes.push_back(syncer::SYNCED_NOTIFICATIONS); |
| 66 // TODO(petewil): Enable on stable when the feature is ready. | 66 // TODO(petewil): Enable on stable when the feature is ready. |
| 67 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); | 67 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
| 68 if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN || | 68 if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN || |
| 69 channel == chrome::VersionInfo::CHANNEL_DEV || | 69 channel == chrome::VersionInfo::CHANNEL_DEV || |
| 70 channel == chrome::VersionInfo::CHANNEL_CANARY) { | 70 channel == chrome::VersionInfo::CHANNEL_CANARY) { |
| 71 datatypes.push_back(syncer::SYNCED_NOTIFICATION_APP_INFO); | 71 datatypes.push_back(syncer::SYNCED_NOTIFICATION_APP_INFO); |
| 72 } | 72 } |
| 73 datatypes.push_back(syncer::MANAGED_USERS); | 73 datatypes.push_back(syncer::SUPERVISED_USERS); |
| 74 datatypes.push_back(syncer::MANAGED_USER_SHARED_SETTINGS); | 74 datatypes.push_back(syncer::SUPERVISED_USER_SHARED_SETTINGS); |
| 75 | 75 |
| 76 return datatypes; | 76 return datatypes; |
| 77 } | 77 } |
| 78 | 78 |
| 79 // Returns the number of default datatypes. | 79 // Returns the number of default datatypes. |
| 80 static size_t DefaultDatatypesCount() { | 80 static size_t DefaultDatatypesCount() { |
| 81 return DefaultDatatypes().size(); | 81 return DefaultDatatypes().size(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 // Asserts that all the default datatypes are in |map|, except | 84 // Asserts that all the default datatypes are in |map|, except |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 } | 140 } |
| 141 | 141 |
| 142 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) { | 142 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) { |
| 143 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL)); | 143 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL)); |
| 144 } | 144 } |
| 145 | 145 |
| 146 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) { | 146 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) { |
| 147 TestSwitchDisablesType( | 147 TestSwitchDisablesType( |
| 148 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS)); | 148 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS)); |
| 149 } | 149 } |
| OLD | NEW |