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/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/extensions/api/preferences_private/preferences_private_
api.h" | 15 #include "chrome/browser/extensions/api/preferences_private/preferences_private_
api.h" |
16 #include "chrome/browser/extensions/extension_apitest.h" | 16 #include "chrome/browser/extensions/extension_apitest.h" |
17 #include "chrome/browser/extensions/extension_function_test_utils.h" | 17 #include "chrome/browser/extensions/extension_function_test_utils.h" |
18 #include "chrome/browser/extensions/extension_test_message_listener.h" | 18 #include "chrome/browser/extensions/extension_test_message_listener.h" |
19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/profiles/profile_manager.h" | 20 #include "chrome/browser/profiles/profile_manager.h" |
21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 21 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
22 #include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" | |
23 #include "chrome/browser/sync/profile_sync_service.h" | 22 #include "chrome/browser/sync/profile_sync_service.h" |
24 #include "chrome/browser/sync/profile_sync_service_factory.h" | 23 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 24 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h" |
25 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
26 #include "chrome/common/chrome_constants.h" | 26 #include "chrome/common/chrome_constants.h" |
27 #include "chrome/common/chrome_paths.h" | 27 #include "chrome/common/chrome_paths.h" |
28 #include "chrome/test/base/testing_profile.h" | 28 #include "chrome/test/base/testing_profile.h" |
29 #include "components/bookmarks/common/bookmark_constants.h" | 29 #include "components/bookmarks/common/bookmark_constants.h" |
30 #include "components/sync_driver/sync_prefs.h" | 30 #include "components/sync_driver/sync_prefs.h" |
31 #include "content/public/browser/browser_context.h" | 31 #include "content/public/browser/browser_context.h" |
32 | 32 |
33 #if defined(OS_CHROMEOS) | 33 #if defined(OS_CHROMEOS) |
34 #include "chromeos/chromeos_switches.h" | 34 #include "chromeos/chromeos_switches.h" |
35 #endif | 35 #endif |
36 | 36 |
37 using extensions::PreferencesPrivateGetSyncCategoriesWithoutPassphraseFunction; | 37 using extensions::PreferencesPrivateGetSyncCategoriesWithoutPassphraseFunction; |
38 | 38 |
39 namespace { | 39 namespace { |
40 | 40 |
41 class FakeProfileSyncService : public ProfileSyncService { | 41 class FakeProfileSyncService : public ProfileSyncService { |
42 public: | 42 public: |
43 explicit FakeProfileSyncService(Profile* profile) | 43 explicit FakeProfileSyncService(Profile* profile) |
44 : ProfileSyncService( | 44 : ProfileSyncService( |
45 NULL, | 45 NULL, |
46 profile, | 46 profile, |
47 make_scoped_ptr<ManagedUserSigninManagerWrapper>(NULL), | 47 make_scoped_ptr<SupervisedUserSigninManagerWrapper>(NULL), |
48 ProfileOAuth2TokenServiceFactory::GetForProfile(profile), | 48 ProfileOAuth2TokenServiceFactory::GetForProfile(profile), |
49 browser_sync::MANUAL_START), | 49 browser_sync::MANUAL_START), |
50 sync_initialized_(true), | 50 sync_initialized_(true), |
51 initialized_state_violation_(false) {} | 51 initialized_state_violation_(false) {} |
52 | 52 |
53 virtual ~FakeProfileSyncService() {} | 53 virtual ~FakeProfileSyncService() {} |
54 | 54 |
55 static KeyedService* BuildFakeProfileSyncService( | 55 static KeyedService* BuildFakeProfileSyncService( |
56 content::BrowserContext* context) { | 56 content::BrowserContext* context) { |
57 return new FakeProfileSyncService(static_cast<Profile*>(context)); | 57 return new FakeProfileSyncService(static_cast<Profile*>(context)); |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 | 192 |
193 // Verifies that we wait for the sync service to be ready before checking | 193 // Verifies that we wait for the sync service to be ready before checking |
194 // encryption status. | 194 // encryption status. |
195 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest, | 195 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest, |
196 GetSyncCategoriesWithoutPassphraseAsynchronous) { | 196 GetSyncCategoriesWithoutPassphraseAsynchronous) { |
197 service_->set_sync_initialized(false); | 197 service_->set_sync_initialized(false); |
198 TestGetSyncCategoriesWithoutPassphraseFunction(); | 198 TestGetSyncCategoriesWithoutPassphraseFunction(); |
199 } | 199 } |
200 | 200 |
201 } // namespace | 201 } // namespace |
OLD | NEW |