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" |
11 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 11 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
12 #include "chrome/browser/sync/chrome_sync_client.h" | 12 #include "chrome/browser/sync/chrome_sync_client.h" |
13 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" | 13 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" |
14 #include "chrome/browser/sync/profile_sync_service.h" | |
15 #include "chrome/browser/sync/profile_sync_service_factory.h" | 14 #include "chrome/browser/sync/profile_sync_service_factory.h" |
16 #include "chrome/browser/sync/profile_sync_test_util.h" | 15 #include "chrome/browser/sync/profile_sync_test_util.h" |
17 #include "chrome/common/channel_info.h" | 16 #include "chrome/common/channel_info.h" |
18 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" |
| 19 #include "components/browser_sync/browser/profile_sync_service.h" |
20 #include "components/browser_sync/common/browser_sync_switches.h" | 20 #include "components/browser_sync/common/browser_sync_switches.h" |
21 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 21 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
22 #include "components/sync_driver/data_type_controller.h" | 22 #include "components/sync_driver/data_type_controller.h" |
23 #include "components/sync_driver/signin_manager_wrapper.h" | 23 #include "components/sync_driver/signin_manager_wrapper.h" |
24 #include "components/sync_driver/sync_util.h" | 24 #include "components/sync_driver/sync_util.h" |
25 #include "content/public/test/test_browser_thread_bundle.h" | 25 #include "content/public/test/test_browser_thread_bundle.h" |
26 #include "google_apis/gaia/gaia_constants.h" | 26 #include "google_apis/gaia/gaia_constants.h" |
27 #include "google_apis/gaia/oauth2_token_service.h" | 27 #include "google_apis/gaia/oauth2_token_service.h" |
28 #include "testing/gtest/include/gtest/gtest.h" | 28 #include "testing/gtest/include/gtest/gtest.h" |
29 #include "ui/app_list/app_list_switches.h" | 29 #include "ui/app_list/app_list_switches.h" |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 } | 173 } |
174 | 174 |
175 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) { | 175 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableOne) { |
176 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL)); | 176 TestSwitchDisablesType(syncer::ModelTypeSet(syncer::AUTOFILL)); |
177 } | 177 } |
178 | 178 |
179 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) { | 179 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableMultiple) { |
180 TestSwitchDisablesType( | 180 TestSwitchDisablesType( |
181 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS)); | 181 syncer::ModelTypeSet(syncer::AUTOFILL_PROFILE, syncer::BOOKMARKS)); |
182 } | 182 } |
OLD | NEW |