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

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

Issue 10540149: [Sync] Persist keystore key across restarts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 "chrome/browser/sync/test_profile_sync_service.h" 5 #include "chrome/browser/sync/test_profile_sync_service.h"
6 6
7 #include "chrome/browser/signin/signin_manager.h" 7 #include "chrome/browser/signin/signin_manager.h"
8 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" 8 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
9 #include "chrome/browser/sync/glue/data_type_controller.h" 9 #include "chrome/browser/sync/glue/data_type_controller.h"
10 #include "chrome/browser/sync/glue/sync_backend_host.h" 10 #include "chrome/browser/sync/glue/sync_backend_host.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer( 75 void SyncBackendHostForProfileSyncTest::RequestConfigureSyncer(
76 sync_api::ConfigureReason reason, 76 sync_api::ConfigureReason reason,
77 syncable::ModelTypeSet types_to_config, 77 syncable::ModelTypeSet types_to_config,
78 const browser_sync::ModelSafeRoutingInfo& routing_info, 78 const browser_sync::ModelSafeRoutingInfo& routing_info,
79 const base::Callback<void(syncable::ModelTypeSet)>& ready_task, 79 const base::Callback<void(syncable::ModelTypeSet)>& ready_task,
80 const base::Closure& retry_callback) { 80 const base::Closure& retry_callback) {
81 syncable::ModelTypeSet sync_ended; 81 syncable::ModelTypeSet sync_ended;
82 if (!fail_initial_download_) 82 if (!fail_initial_download_)
83 sync_ended.PutAll(types_to_config); 83 sync_ended.PutAll(types_to_config);
84 84
85 FinishConfigureDataTypesOnFrontendLoop(types_to_config, 85 FinishConfigureDataTypesOnFrontendLoop("keystore_token",
86 types_to_config,
86 sync_ended, 87 sync_ended,
87 ready_task); 88 ready_task);
88 } 89 }
89 90
90 void SyncBackendHostForProfileSyncTest::SetHistoryServiceExpectations( 91 void SyncBackendHostForProfileSyncTest::SetHistoryServiceExpectations(
91 ProfileMock* profile) { 92 ProfileMock* profile) {
92 EXPECT_CALL(*profile, GetHistoryService(testing::_)). 93 EXPECT_CALL(*profile, GetHistoryService(testing::_)).
93 WillOnce(testing::Return((HistoryService*)NULL)); 94 WillOnce(testing::Return((HistoryService*)NULL));
94 } 95 }
95 96
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 void TestProfileSyncService::CreateBackend() { 212 void TestProfileSyncService::CreateBackend() {
212 backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest( 213 backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest(
213 profile(), 214 profile(),
214 sync_prefs_.AsWeakPtr(), 215 sync_prefs_.AsWeakPtr(),
215 invalidator_storage_.AsWeakPtr(), 216 invalidator_storage_.AsWeakPtr(),
216 set_initial_sync_ended_on_init_, 217 set_initial_sync_ended_on_init_,
217 synchronous_backend_initialization_, 218 synchronous_backend_initialization_,
218 fail_initial_download_, 219 fail_initial_download_,
219 use_real_database_)); 220 use_real_database_));
220 } 221 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698