OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/bind.h" | 6 #include "base/bind.h" |
7 #include "base/bind_helpers.h" | 7 #include "base/bind_helpers.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/path_service.h" | 13 #include "base/path_service.h" |
14 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
15 #include "base/thread_task_runner_handle.h" | 15 #include "base/thread_task_runner_handle.h" |
16 #include "base/values.h" | 16 #include "base/values.h" |
17 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
18 #include "chrome/browser/extensions/api/preferences_private/preferences_private_
api.h" | 18 #include "chrome/browser/extensions/api/preferences_private/preferences_private_
api.h" |
19 #include "chrome/browser/extensions/extension_apitest.h" | 19 #include "chrome/browser/extensions/extension_apitest.h" |
20 #include "chrome/browser/extensions/extension_function_test_utils.h" | 20 #include "chrome/browser/extensions/extension_function_test_utils.h" |
21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
22 #include "chrome/browser/profiles/profile_manager.h" | 22 #include "chrome/browser/profiles/profile_manager.h" |
23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
24 #include "chrome/browser/sync/chrome_sync_client.h" | 24 #include "chrome/browser/sync/chrome_sync_client.h" |
25 #include "chrome/browser/sync/profile_sync_service.h" | |
26 #include "chrome/browser/sync/profile_sync_service_factory.h" | 25 #include "chrome/browser/sync/profile_sync_service_factory.h" |
27 #include "chrome/browser/sync/profile_sync_test_util.h" | 26 #include "chrome/browser/sync/profile_sync_test_util.h" |
28 #include "chrome/browser/ui/browser.h" | 27 #include "chrome/browser/ui/browser.h" |
29 #include "chrome/common/channel_info.h" | 28 #include "chrome/common/channel_info.h" |
30 #include "chrome/common/chrome_constants.h" | 29 #include "chrome/common/chrome_constants.h" |
31 #include "chrome/common/chrome_paths.h" | 30 #include "chrome/common/chrome_paths.h" |
32 #include "chrome/test/base/testing_profile.h" | 31 #include "chrome/test/base/testing_profile.h" |
33 #include "components/bookmarks/common/bookmark_constants.h" | 32 #include "components/bookmarks/common/bookmark_constants.h" |
| 33 #include "components/browser_sync/browser/profile_sync_service.h" |
34 #include "components/sync_driver/signin_manager_wrapper.h" | 34 #include "components/sync_driver/signin_manager_wrapper.h" |
35 #include "components/sync_driver/sync_api_component_factory_mock.h" | 35 #include "components/sync_driver/sync_api_component_factory_mock.h" |
36 #include "components/sync_driver/sync_prefs.h" | 36 #include "components/sync_driver/sync_prefs.h" |
37 #include "content/public/browser/browser_context.h" | 37 #include "content/public/browser/browser_context.h" |
38 #include "extensions/test/extension_test_message_listener.h" | 38 #include "extensions/test/extension_test_message_listener.h" |
39 | 39 |
40 #if defined(OS_CHROMEOS) | 40 #if defined(OS_CHROMEOS) |
41 #include "chromeos/chromeos_switches.h" | 41 #include "chromeos/chromeos_switches.h" |
42 #endif | 42 #endif |
43 | 43 |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 | 204 |
205 // Verifies that we wait for the sync service to be ready before checking | 205 // Verifies that we wait for the sync service to be ready before checking |
206 // encryption status. | 206 // encryption status. |
207 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest, | 207 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest, |
208 GetSyncCategoriesWithoutPassphraseAsynchronous) { | 208 GetSyncCategoriesWithoutPassphraseAsynchronous) { |
209 service_->set_sync_initialized(false); | 209 service_->set_sync_initialized(false); |
210 TestGetSyncCategoriesWithoutPassphraseFunction(); | 210 TestGetSyncCategoriesWithoutPassphraseFunction(); |
211 } | 211 } |
212 | 212 |
213 } // namespace | 213 } // namespace |
OLD | NEW |