| Index: chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
|
| index d94ac07371de32793bdc3378fd071feae5621a6d..58a93349b3c26eb23468e6823cb59745ade7045b 100644
|
| --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
|
| +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
|
| @@ -153,7 +153,7 @@ void FeedbackPrivateAPI::RequestFeedbackForFlow(
|
| // static
|
| base::Closure* FeedbackPrivateGetStringsFunction::test_callback_ = NULL;
|
|
|
| -bool FeedbackPrivateGetStringsFunction::RunSync() {
|
| +ExtensionFunction::ResponseAction FeedbackPrivateGetStringsFunction::Run() {
|
| std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
|
|
| #define SET_STRING(id, idr) \
|
| @@ -204,21 +204,19 @@ bool FeedbackPrivateGetStringsFunction::RunSync() {
|
| const std::string& app_locale = g_browser_process->GetApplicationLocale();
|
| webui::SetLoadTimeDataDefaults(app_locale, dict.get());
|
|
|
| - SetResult(std::move(dict));
|
|
|
| if (test_callback_ && !test_callback_->is_null())
|
| test_callback_->Run();
|
|
|
| - return true;
|
| + return RespondNow(OneArgument(std::move(dict)));
|
| }
|
|
|
| -bool FeedbackPrivateGetUserEmailFunction::RunSync() {
|
| - SigninManagerBase* signin_manager =
|
| - SigninManagerFactory::GetForProfile(GetProfile());
|
| - SetResult(base::MakeUnique<base::StringValue>(
|
| +ExtensionFunction::ResponseAction FeedbackPrivateGetUserEmailFunction::Run() {
|
| + SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(
|
| + Profile::FromBrowserContext(browser_context()));
|
| + return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
|
| signin_manager ? signin_manager->GetAuthenticatedAccountInfo().email
|
| - : std::string()));
|
| - return true;
|
| + : std::string())));
|
| }
|
|
|
| bool FeedbackPrivateGetSystemInformationFunction::RunAsync() {
|
|
|