Commit 0a825675 authored by Colin Blundell's avatar Colin Blundell Committed by Commit Bot

Move away from deprecated ConstructAboutInfo() in PSSHarness

sync_ui_util::ConstructAboutInfo_DEPRECATED() is ... deprecated. This
CL ports ProfileSyncServiceHarness away from it, having PSSHarness
directly supply its cached account info to ConstructAboutInfo().

Bug: 783144
Change-Id: I6bff37d2e39244dfdcb853980783d1e9cada36bd
Reviewed-on: https://chromium-review.googlesource.com/768875Reviewed-by: default avatarNicolas Zea <zea@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517816}
parent e296c1ed
...@@ -533,9 +533,12 @@ bool ProfileSyncServiceHarness::IsTypePreferred(syncer::ModelType type) { ...@@ -533,9 +533,12 @@ bool ProfileSyncServiceHarness::IsTypePreferred(syncer::ModelType type) {
} }
std::string ProfileSyncServiceHarness::GetServiceStatus() { std::string ProfileSyncServiceHarness::GetServiceStatus() {
AccountInfo primary_account_info;
primary_account_info.email = username_;
primary_account_info.gaia = gaia_id_;
std::unique_ptr<base::DictionaryValue> value( std::unique_ptr<base::DictionaryValue> value(
syncer::sync_ui_util::ConstructAboutInformation_DEPRECATED( syncer::sync_ui_util::ConstructAboutInformation(
service(), chrome::GetChannel())); service(), primary_account_info, chrome::GetChannel()));
std::string service_status; std::string service_status;
base::JSONWriter::WriteWithOptions( base::JSONWriter::WriteWithOptions(
*value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status); *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment