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

Side by Side Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 2365763002: [Sync] Removed passphrase helper methods, removed ((n)) pattern, and fixed lint violations. (Closed)
Patch Set: Created 4 years, 3 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
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/integration/sync_test.h" 5 #include "chrome/browser/sync/test/integration/sync_test.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <limits> 10 #include <limits>
(...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after
1014 return ::IsEncryptionComplete(GetClient(index)->service()); 1014 return ::IsEncryptionComplete(GetClient(index)->service());
1015 } 1015 }
1016 1016
1017 bool SyncTest::AwaitEncryptionComplete(int index) { 1017 bool SyncTest::AwaitEncryptionComplete(int index) {
1018 ProfileSyncService* service = GetClient(index)->service(); 1018 ProfileSyncService* service = GetClient(index)->service();
1019 EncryptionChecker checker(service); 1019 EncryptionChecker checker(service);
1020 checker.Wait(); 1020 checker.Wait();
1021 return !checker.TimedOut(); 1021 return !checker.TimedOut();
1022 } 1022 }
1023 1023
1024 void SyncTest::SetEncryptionPassphrase(
maxbogue 2016/09/23 17:39:37 Honestly I'm not even sure these methods are neces
skym 2016/09/23 17:55:20 Done. I was thinking it'd make more sense once I
1025 int index,
1026 const std::string& passphrase,
1027 ProfileSyncService::PassphraseType type) {
1028 GetClient(index)->service()->SetEncryptionPassphrase(passphrase, type);
1029 }
1030
1031 bool SyncTest::SetDecryptionPassphrase(int index,
1032 const std::string& passphrase) {
1033 return GetClient(index)->service()->SetDecryptionPassphrase(passphrase);
1034 }
1035
1024 bool SyncTest::AwaitQuiescence() { 1036 bool SyncTest::AwaitQuiescence() {
1025 return ProfileSyncServiceHarness::AwaitQuiescence(clients()); 1037 return ProfileSyncServiceHarness::AwaitQuiescence(clients());
1026 } 1038 }
1027 1039
1028 bool SyncTest::UsingExternalServers() { 1040 bool SyncTest::UsingExternalServers() {
1029 return server_type_ == EXTERNAL_LIVE_SERVER; 1041 return server_type_ == EXTERNAL_LIVE_SERVER;
1030 } 1042 }
1031 1043
1032 bool SyncTest::ServerSupportsNotificationControl() const { 1044 bool SyncTest::ServerSupportsNotificationControl() const {
1033 EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_); 1045 EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_);
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 1144
1133 void SyncTest::TriggerSyncForModelTypes(int index, 1145 void SyncTest::TriggerSyncForModelTypes(int index,
1134 syncer::ModelTypeSet model_types) { 1146 syncer::ModelTypeSet model_types) {
1135 GetSyncService(index)->TriggerRefresh(model_types); 1147 GetSyncService(index)->TriggerRefresh(model_types);
1136 } 1148 }
1137 1149
1138 void SyncTest::SetPreexistingPreferencesFileContents( 1150 void SyncTest::SetPreexistingPreferencesFileContents(
1139 const std::string& contents) { 1151 const std::string& contents) {
1140 preexisting_preferences_file_contents_ = contents; 1152 preexisting_preferences_file_contents_ = contents;
1141 } 1153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698