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

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

Issue 12680004: Remove chrome/ code to handle App Notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 7 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/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.h" 10 #include "base/message_loop.h"
(...skipping 16 matching lines...) Expand all
27 virtual void SetUp() { 27 virtual void SetUp() {
28 profile_.reset(new TestingProfile()); 28 profile_.reset(new TestingProfile());
29 base::FilePath program_path(FILE_PATH_LITERAL("chrome.exe")); 29 base::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<syncer::ModelType> DefaultDatatypes() { 34 static std::vector<syncer::ModelType> DefaultDatatypes() {
35 std::vector<syncer::ModelType> datatypes; 35 std::vector<syncer::ModelType> datatypes;
36 datatypes.push_back(syncer::APPS); 36 datatypes.push_back(syncer::APPS);
37 datatypes.push_back(syncer::APP_NOTIFICATIONS);
38 datatypes.push_back(syncer::APP_SETTINGS); 37 datatypes.push_back(syncer::APP_SETTINGS);
39 datatypes.push_back(syncer::AUTOFILL); 38 datatypes.push_back(syncer::AUTOFILL);
40 datatypes.push_back(syncer::AUTOFILL_PROFILE); 39 datatypes.push_back(syncer::AUTOFILL_PROFILE);
41 datatypes.push_back(syncer::BOOKMARKS); 40 datatypes.push_back(syncer::BOOKMARKS);
42 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) 41 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
43 datatypes.push_back(syncer::DICTIONARY); 42 datatypes.push_back(syncer::DICTIONARY);
44 #endif 43 #endif
45 datatypes.push_back(syncer::EXTENSIONS); 44 datatypes.push_back(syncer::EXTENSIONS);
46 datatypes.push_back(syncer::EXTENSION_SETTINGS); 45 datatypes.push_back(syncer::EXTENSION_SETTINGS);
47 datatypes.push_back(syncer::PASSWORDS); 46 datatypes.push_back(syncer::PASSWORDS);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 148
150 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) { 149 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) {
151 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile, 150 TestSwitchDisablesType(switches::kDisableSyncAutofillProfile,
152 syncer::AUTOFILL_PROFILE); 151 syncer::AUTOFILL_PROFILE);
153 } 152 }
154 153
155 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) { 154 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) {
156 TestSwitchDisablesType(switches::kDisableSyncPasswords, 155 TestSwitchDisablesType(switches::kDisableSyncPasswords,
157 syncer::PASSWORDS); 156 syncer::PASSWORDS);
158 } 157 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698