| 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 19 matching lines...) Expand all Loading... |
| 30 virtual void SetUp() { | 30 virtual void SetUp() { |
| 31 profile_.reset(new TestingProfile()); | 31 profile_.reset(new TestingProfile()); |
| 32 base::FilePath program_path(FILE_PATH_LITERAL("chrome.exe")); | 32 base::FilePath program_path(FILE_PATH_LITERAL("chrome.exe")); |
| 33 command_line_.reset(new CommandLine(program_path)); | 33 command_line_.reset(new CommandLine(program_path)); |
| 34 } | 34 } |
| 35 | 35 |
| 36 // Returns the collection of default datatypes. | 36 // Returns the collection of default datatypes. |
| 37 static std::vector<syncer::ModelType> DefaultDatatypes() { | 37 static std::vector<syncer::ModelType> DefaultDatatypes() { |
| 38 std::vector<syncer::ModelType> datatypes; | 38 std::vector<syncer::ModelType> datatypes; |
| 39 datatypes.push_back(syncer::APPS); | 39 datatypes.push_back(syncer::APPS); |
| 40 datatypes.push_back(syncer::APP_LIST); |
| 40 datatypes.push_back(syncer::APP_SETTINGS); | 41 datatypes.push_back(syncer::APP_SETTINGS); |
| 41 datatypes.push_back(syncer::AUTOFILL); | 42 datatypes.push_back(syncer::AUTOFILL); |
| 42 datatypes.push_back(syncer::AUTOFILL_PROFILE); | 43 datatypes.push_back(syncer::AUTOFILL_PROFILE); |
| 43 datatypes.push_back(syncer::BOOKMARKS); | 44 datatypes.push_back(syncer::BOOKMARKS); |
| 44 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) | 45 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) |
| 45 datatypes.push_back(syncer::DICTIONARY); | 46 datatypes.push_back(syncer::DICTIONARY); |
| 46 #endif | 47 #endif |
| 47 datatypes.push_back(syncer::EXTENSIONS); | 48 datatypes.push_back(syncer::EXTENSIONS); |
| 48 datatypes.push_back(syncer::EXTENSION_SETTINGS); | 49 datatypes.push_back(syncer::EXTENSION_SETTINGS); |
| 49 datatypes.push_back(syncer::HISTORY_DELETE_DIRECTIVES); | 50 datatypes.push_back(syncer::HISTORY_DELETE_DIRECTIVES); |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 | 167 |
| 167 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { | 168 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { |
| 168 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, | 169 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, |
| 169 syncer::AUTOFILL_PROFILE); | 170 syncer::AUTOFILL_PROFILE); |
| 170 } | 171 } |
| 171 | 172 |
| 172 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { | 173 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { |
| 173 TestSwitchDisablesType(switches::kDisableSyncPasswords, | 174 TestSwitchDisablesType(switches::kDisableSyncPasswords, |
| 174 syncer::PASSWORDS); | 175 syncer::PASSWORDS); |
| 175 } | 176 } |
| OLD | NEW |