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

Side by Side Diff: chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

Issue 9489002: Enable the syncing of extension and app settings by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit tests Created 8 years, 9 months 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 | Annotate | Revision Log
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 <vector> 5 #include <vector>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 15 matching lines...) Expand all
26 26
27 virtual void SetUp() { 27 virtual void SetUp() {
28 profile_.reset(new TestingProfile()); 28 profile_.reset(new TestingProfile());
29 FilePath program_path(FILE_PATH_LITERAL("chrome.exe")); 29 FilePath program_path(FILE_PATH_LITERAL("chrome.exe"));
30 command_line_.reset(new CommandLine(program_path)); 30 command_line_.reset(new CommandLine(program_path));
31 } 31 }
32 32
33 // Returns the collection of default datatypes. 33 // Returns the collection of default datatypes.
34 static std::vector<syncable::ModelType> DefaultDatatypes() { 34 static std::vector<syncable::ModelType> DefaultDatatypes() {
35 std::vector<syncable::ModelType> datatypes; 35 std::vector<syncable::ModelType> datatypes;
36 datatypes.push_back(syncable::BOOKMARKS);
37 datatypes.push_back(syncable::PREFERENCES);
38 datatypes.push_back(syncable::AUTOFILL);
39 datatypes.push_back(syncable::THEMES);
40 datatypes.push_back(syncable::EXTENSIONS);
41 datatypes.push_back(syncable::APPS); 36 datatypes.push_back(syncable::APPS);
42 datatypes.push_back(syncable::APP_NOTIFICATIONS); 37 datatypes.push_back(syncable::APP_NOTIFICATIONS);
38 datatypes.push_back(syncable::APP_SETTINGS);
39 datatypes.push_back(syncable::AUTOFILL);
43 datatypes.push_back(syncable::AUTOFILL_PROFILE); 40 datatypes.push_back(syncable::AUTOFILL_PROFILE);
41 datatypes.push_back(syncable::BOOKMARKS);
42 datatypes.push_back(syncable::EXTENSIONS);
43 datatypes.push_back(syncable::EXTENSION_SETTINGS);
44 datatypes.push_back(syncable::PASSWORDS); 44 datatypes.push_back(syncable::PASSWORDS);
45 datatypes.push_back(syncable::PREFERENCES);
46 datatypes.push_back(syncable::SEARCH_ENGINES);
47 datatypes.push_back(syncable::THEMES);
45 datatypes.push_back(syncable::TYPED_URLS); 48 datatypes.push_back(syncable::TYPED_URLS);
46 datatypes.push_back(syncable::SEARCH_ENGINES);
47 return datatypes; 49 return datatypes;
48 } 50 }
49 51
50 // Returns the number of default datatypes. 52 // Returns the number of default datatypes.
51 static size_t DefaultDatatypesCount() { 53 static size_t DefaultDatatypesCount() {
52 return DefaultDatatypes().size(); 54 return DefaultDatatypes().size();
53 } 55 }
54 56
55 // Asserts that all the default datatypes are in |map|, except 57 // Asserts that all the default datatypes are in |map|, except
56 // for |exception_type|, which unless it is UNDEFINED, is asserted to 58 // for |exception_type|, which unless it is UNDEFINED, is asserted to
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 144
143 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { 145 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) {
144 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, 146 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile,
145 syncable::AUTOFILL_PROFILE); 147 syncable::AUTOFILL_PROFILE);
146 } 148 }
147 149
148 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { 150 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) {
149 TestSwitchDisablesType(switches::kDisableSyncPasswords, 151 TestSwitchDisablesType(switches::kDisableSyncPasswords,
150 syncable::PASSWORDS); 152 syncable::PASSWORDS);
151 } 153 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.cc ('k') | chrome/browser/sync/test/integration/sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698