Remove some usages of AsyncExtensionFunction::results_.

extensions/browser/api/management/management_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/api/management/management_api.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 300 matching lines @@
       ExtensionRegistry::Get(browser_context())
           ->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
   if (!extension)
     return RespondNow(Error(keys::kNoExtensionError, params->id));
 
   std::vector<std::string> warnings = CreateWarningsList(extension);
   return RespondNow(ArgumentList(
       management::GetPermissionWarningsById::Results::Create(warnings)));
 }
 
-bool ManagementGetPermissionWarningsByManifestFunction::RunAsync() {
+ExtensionFunction::ResponseAction
+ManagementGetPermissionWarningsByManifestFunction::Run() {
   std::unique_ptr<management::GetPermissionWarningsByManifest::Params> params(
       management::GetPermissionWarningsByManifest::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   const ManagementAPIDelegate* delegate = ManagementAPI::GetFactoryInstance()
                                               ->Get(browser_context())
                                               ->GetDelegate();
 
   if (delegate) {
     delegate->GetPermissionWarningsByManifestFunctionDelegate(
         this, params->manifest_str);
 
     // Matched with a Release() in OnParseSuccess/Failure().
     AddRef();
 
     // Response is sent async in OnParseSuccess/Failure().
-    return true;
+    return RespondLater();
   } else {
     // TODO(lfg) add error string
-    OnParseFailure("");
-    return false;
+    return RespondNow(Error(kUnknownErrorDoNotUse));
   }
 }
 
 void ManagementGetPermissionWarningsByManifestFunction::OnParseSuccess(
     std::unique_ptr<base::Value> value) {
   if (!value->IsType(base::Value::Type::DICTIONARY)) {
     OnParseFailure(keys::kManifestParseError);
     return;
   }
   const base::DictionaryValue* parsed_manifest =
       static_cast<const base::DictionaryValue*>(value.get());
 
+  std::string error;
   scoped_refptr<Extension> extension =
       Extension::Create(base::FilePath(), Manifest::INVALID_LOCATION,
-                        *parsed_manifest, Extension::NO_FLAGS, &error_);
+                        *parsed_manifest, Extension::NO_FLAGS, &error);
+  // TODO(lazyboy): Do we need to use |error|?
   if (!extension) {
     OnParseFailure(keys::kExtensionCreateError);
     return;
   }
 
   std::vector<std::string> warnings = CreateWarningsList(extension.get());
-  results_ =
-      management::GetPermissionWarningsByManifest::Results::Create(warnings);
-  SendResponse(true);
+  Respond(ArgumentList(
+      management::GetPermissionWarningsByManifest::Results::Create(warnings)));
 
-  // Matched with AddRef() in RunAsync().
+  // Matched with AddRef() in Run().
   Release();
 }
 
 void ManagementGetPermissionWarningsByManifestFunction::OnParseFailure(
     const std::string& error) {
-  error_ = error;
-  SendResponse(false);
+  Respond(Error(error));
 
-  // Matched with AddRef() in RunAsync().
+  // Matched with AddRef() in Run().
   Release();
 }
 
 ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
   std::unique_ptr<management::LaunchApp::Params> params(
       management::LaunchApp::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   const Extension* extension =
       ExtensionRegistry::Get(browser_context())
           ->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
@@ skipping 237 matching lines @@
 ManagementCreateAppShortcutFunction::~ManagementCreateAppShortcutFunction() {
 }
 
 // static
 void ManagementCreateAppShortcutFunction::SetAutoConfirmForTest(
     bool should_proceed) {
   auto_confirm_for_test = should_proceed ? PROCEED : ABORT;
 }
 
 void ManagementCreateAppShortcutFunction::OnCloseShortcutPrompt(bool created) {
-  if (!created)
-    error_ = keys::kCreateShortcutCanceledError;
-  SendResponse(created);
+  Respond(created ? NoArguments() : Error(keys::kCreateShortcutCanceledError));
   Release();

[Devlin, 2017/01/20 00:16:01]

Can we add a "balanced by" comment?

[lazyboy, 2017/01/20 00:54:47]

Done.

 }
 
-bool ManagementCreateAppShortcutFunction::RunAsync() {
-  if (!user_gesture()) {
-    error_ = keys::kGestureNeededForCreateAppShortcutError;
-    return false;
-  }
+ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
+  if (!user_gesture())
+    return RespondNow(Error(keys::kGestureNeededForCreateAppShortcutError));
 
   std::unique_ptr<management::CreateAppShortcut::Params> params(
       management::CreateAppShortcut::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   const Extension* extension =
       ExtensionRegistry::Get(browser_context())
           ->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
   if (!extension) {
-    error_ =
-        ErrorUtils::FormatErrorMessage(keys::kNoExtensionError, params->id);
-    return false;
+    return RespondNow(Error(
+        ErrorUtils::FormatErrorMessage(keys::kNoExtensionError, params->id)));
   }
 
   if (!extension->is_app()) {
-    error_ = ErrorUtils::FormatErrorMessage(keys::kNotAnAppError, params->id);
-    return false;
+    return RespondNow(Error(
+        ErrorUtils::FormatErrorMessage(keys::kNotAnAppError, params->id)));
   }
 
 #if defined(OS_MACOSX)
-  if (!extension->is_platform_app()) {
-    error_ = keys::kCreateOnlyPackagedAppShortcutMac;
-    return false;
-  }
+  if (!extension->is_platform_app())
+    return RespondNow(Error(keys::kCreateOnlyPackagedAppShortcutMac));
 #endif
 
   if (auto_confirm_for_test != DO_NOT_SKIP) {
     // Matched with a Release() in OnCloseShortcutPrompt().
     AddRef();
 
     OnCloseShortcutPrompt(auto_confirm_for_test == PROCEED);
-
-    return true;
+    // OnCloseShortcutPrompt() might have called Respond() already.
+    return did_respond() ? AlreadyResponded() : RespondLater();
   }
 
   std::string error;
   if (ManagementAPI::GetFactoryInstance()
           ->Get(browser_context())
           ->GetDelegate()
           ->CreateAppShortcutFunctionDelegate(this, extension, &error)) {
     // Matched with a Release() in OnCloseShortcutPrompt().
     AddRef();
+    // Response is sent async in OnCloseShortcutPrompt().
+    return RespondLater();
   } else {
-    SetError(error);
+    return RespondNow(Error(error));
   }
-
-  // Response is sent async in OnCloseShortcutPrompt().
-  return true;
 }
 
 ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
   if (!user_gesture())
     return RespondNow(Error(keys::kGestureNeededForSetLaunchTypeError));
 
   std::unique_ptr<management::SetLaunchType::Params> params(
       management::SetLaunchType::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   const Extension* extension =
@@ skipping 42 matching lines @@
 
 ManagementGenerateAppForLinkFunction::ManagementGenerateAppForLinkFunction() {
 }
 
 ManagementGenerateAppForLinkFunction::~ManagementGenerateAppForLinkFunction() {
 }
 
 void ManagementGenerateAppForLinkFunction::FinishCreateBookmarkApp(
     const Extension* extension,
     const WebApplicationInfo& web_app_info) {
-  if (extension) {
-    results_ = management::GenerateAppForLink::Results::Create(
-        CreateExtensionInfo(*extension, browser_context()));
-
-    SendResponse(true);
-    Release();
-  } else {
-    error_ = keys::kGenerateAppForLinkInstallError;
-    SendResponse(false);
-    Release();
-  }
+  ResponseValue response =
+      extension ? ArgumentList(management::GenerateAppForLink::Results::Create(
+                      CreateExtensionInfo(*extension, browser_context())))
+                : Error(keys::kGenerateAppForLinkInstallError);
+  Respond(std::move(response));
+  Release();  // Balanced in Run().
 }
 
-bool ManagementGenerateAppForLinkFunction::RunAsync() {
-  if (!user_gesture()) {
-    error_ = keys::kGestureNeededForGenerateAppForLinkError;
-    return false;
-  }
+ExtensionFunction::ResponseAction ManagementGenerateAppForLinkFunction::Run() {
+  if (!user_gesture())
+    return RespondNow(Error(keys::kGestureNeededForGenerateAppForLinkError));
 
   std::unique_ptr<management::GenerateAppForLink::Params> params(
       management::GenerateAppForLink::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   GURL launch_url(params->url);
   if (!launch_url.is_valid() || !launch_url.SchemeIsHTTPOrHTTPS()) {
-    error_ =
-        ErrorUtils::FormatErrorMessage(keys::kInvalidURLError, params->url);
-    return false;
+    return RespondNow(Error(
+        ErrorUtils::FormatErrorMessage(keys::kInvalidURLError, params->url)));
   }
 
-  if (params->title.empty()) {
-    error_ = keys::kEmptyTitleError;
-    return false;
-  }
+  if (params->title.empty())
+    return RespondNow(Error(keys::kEmptyTitleError));
 
   app_for_link_delegate_ =
       ManagementAPI::GetFactoryInstance()
           ->Get(browser_context())
           ->GetDelegate()
           ->GenerateAppForLinkFunctionDelegate(this, browser_context(),
                                                params->title, launch_url);
 
   // Matched with a Release() in FinishCreateBookmarkApp().
   AddRef();
 
   // Response is sent async in FinishCreateBookmarkApp().
-  return true;
+  return RespondLater();
 }
 
 ManagementEventRouter::ManagementEventRouter(content::BrowserContext* context)
     : browser_context_(context), extension_registry_observer_(this) {
   extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
 }
 
 ManagementEventRouter::~ManagementEventRouter() {
 }
 
@@ skipping 71 matching lines @@
 ManagementAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) {
   management_event_router_.reset(new ManagementEventRouter(browser_context_));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 }  // namespace extensions