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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 sync_driver::SyncPrefs sync_prefs(profile->GetPrefs()); | 133 sync_driver::SyncPrefs sync_prefs(profile->GetPrefs()); |
134 sync_prefs.SetKeepEverythingSynced(false); | 134 sync_prefs.SetKeepEverythingSynced(false); |
135 | 135 |
136 ProfileManager* profile_manager = g_browser_process->profile_manager(); | 136 ProfileManager* profile_manager = g_browser_process->profile_manager(); |
137 profile_manager->RegisterTestingProfile(profile, true, false); | 137 profile_manager->RegisterTestingProfile(profile, true, false); |
138 | 138 |
139 service_ = static_cast<FakeProfileSyncService*>( | 139 service_ = static_cast<FakeProfileSyncService*>( |
140 ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( | 140 ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse( |
141 profile, &FakeProfileSyncService::BuildFakeProfileSyncService)); | 141 profile, &FakeProfileSyncService::BuildFakeProfileSyncService)); |
142 | 142 |
143 browser_ = new Browser(Browser::CreateParams( | 143 browser_ = new Browser(Browser::CreateParams(profile)); |
144 profile, chrome::HOST_DESKTOP_TYPE_NATIVE)); | |
145 } | 144 } |
146 | 145 |
147 // Calls GetSyncCategoriesWithoutPassphraseFunction and verifies that the | 146 // Calls GetSyncCategoriesWithoutPassphraseFunction and verifies that the |
148 // results returned are the expected ones. | 147 // results returned are the expected ones. |
149 void TestGetSyncCategoriesWithoutPassphraseFunction(); | 148 void TestGetSyncCategoriesWithoutPassphraseFunction(); |
150 | 149 |
151 protected: | 150 protected: |
152 Browser* browser_; | 151 Browser* browser_; |
153 FakeProfileSyncService* service_; | 152 FakeProfileSyncService* service_; |
154 | 153 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 | 188 |
190 // Verifies that we wait for the sync service to be ready before checking | 189 // Verifies that we wait for the sync service to be ready before checking |
191 // encryption status. | 190 // encryption status. |
192 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest, | 191 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest, |
193 GetSyncCategoriesWithoutPassphraseAsynchronous) { | 192 GetSyncCategoriesWithoutPassphraseAsynchronous) { |
194 service_->set_sync_initialized(false); | 193 service_->set_sync_initialized(false); |
195 TestGetSyncCategoriesWithoutPassphraseFunction(); | 194 TestGetSyncCategoriesWithoutPassphraseFunction(); |
196 } | 195 } |
197 | 196 |
198 } // namespace | 197 } // namespace |
OLD | NEW |