summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/profile_sync_service_harness.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_harness.cc')
-rw-r--r--chrome/browser/sync/profile_sync_service_harness.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
index eb0b074..c290374 100644
--- a/chrome/browser/sync/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/profile_sync_service_harness.cc
@@ -134,7 +134,7 @@ ProfileSyncServiceHarness* ProfileSyncServiceHarness::CreateAndAttach(
NOTREACHED() << "Profile has never signed into sync.";
return NULL;
}
- return new ProfileSyncServiceHarness(profile, std::string(), std::string());
+ return new ProfileSyncServiceHarness(profile, "", "");
}
void ProfileSyncServiceHarness::SetCredentials(const std::string& username,
@@ -179,8 +179,7 @@ bool ProfileSyncServiceHarness::SetupSync(
service_->SetSetupInProgress(true);
// Authenticate sync client using GAIA credentials.
- service_->signin()
- ->StartSignIn(username_, password_, std::string(), std::string());
+ service_->signin()->StartSignIn(username_, password_, "", "");
// Wait for the OnBackendInitialized() callback.
if (!AwaitBackendInitialized()) {
@@ -1015,7 +1014,7 @@ std::string ProfileSyncServiceHarness::GetSerializedProgressMarker(
syncer::ProgressMarkerMap::const_iterator it =
markers_map.find(model_type);
- return (it != markers_map.end()) ? it->second : std::string();
+ return (it != markers_map.end()) ? it->second : "";
}
std::string ProfileSyncServiceHarness::GetClientInfoString(