Added support for multiple parameters to Extension API callbacks.

chrome/browser/extensions/api/webstore_private/webstore_private_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 "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 242 matching lines @@
 
 BeginInstallWithManifestFunction::~BeginInstallWithManifestFunction() {}
 
 bool BeginInstallWithManifestFunction::RunImpl() {
   DictionaryValue* details = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &details));
   CHECK(details);
 
   EXTENSION_FUNCTION_VALIDATE(details->GetString(kIdKey, &id_));
   if (!extensions::Extension::IdIsValid(id_)) {
-    SetResult(INVALID_ID);
+    SetResultCode(INVALID_ID);
     error_ = kInvalidIdError;
     return false;
   }
 
   EXTENSION_FUNCTION_VALIDATE(details->GetString(kManifestKey, &manifest_));
 
   if (details->HasKey(kIconDataKey) && details->HasKey(kIconUrlKey)) {
-    SetResult(ICON_ERROR);
+    SetResultCode(ICON_ERROR);
     error_ = kCannotSpecifyIconDataAndUrlError;
     return false;
   }
 
   if (details->HasKey(kIconDataKey))
     EXTENSION_FUNCTION_VALIDATE(details->GetString(kIconDataKey, &icon_data_));
 
   GURL icon_url;
   if (details->HasKey(kIconUrlKey)) {
     std::string tmp_url;
     EXTENSION_FUNCTION_VALIDATE(details->GetString(kIconUrlKey, &tmp_url));
     icon_url = source_url().Resolve(tmp_url);
     if (!icon_url.is_valid()) {
-      SetResult(INVALID_ICON_URL);
+      SetResultCode(INVALID_ICON_URL);
       error_ = kInvalidIconUrlError;
       return false;
     }
   }
 
   if (details->HasKey(kLocalizedNameKey))
     EXTENSION_FUNCTION_VALIDATE(details->GetString(kLocalizedNameKey,
                                                    &localized_name_));
 
   if (details->HasKey(kAppInstallBubbleKey))
@@ skipping 13 matching lines @@
 
   // Matched with a Release in OnWebstoreParseSuccess/OnWebstoreParseFailure.
   AddRef();
 
   // The response is sent asynchronously in OnWebstoreParseSuccess/
   // OnWebstoreParseFailure.
   return true;
 }
 
 
-void BeginInstallWithManifestFunction::SetResult(ResultCode code) {
+void BeginInstallWithManifestFunction::SetResultCode(ResultCode code) {
   switch (code) {
     case ERROR_NONE:
-      result_.reset(Value::CreateStringValue(""));
+      SetResult(Value::CreateStringValue(""));
       break;
     case UNKNOWN_ERROR:
-      result_.reset(Value::CreateStringValue("unknown_error"));
+      SetResult(Value::CreateStringValue("unknown_error"));
       break;
     case USER_CANCELLED:
-      result_.reset(Value::CreateStringValue("user_cancelled"));
+      SetResult(Value::CreateStringValue("user_cancelled"));
       break;
     case MANIFEST_ERROR:
-      result_.reset(Value::CreateStringValue("manifest_error"));
+      SetResult(Value::CreateStringValue("manifest_error"));
       break;
     case ICON_ERROR:
-      result_.reset(Value::CreateStringValue("icon_error"));
+      SetResult(Value::CreateStringValue("icon_error"));
       break;
     case INVALID_ID:
-      result_.reset(Value::CreateStringValue("invalid_id"));
+      SetResult(Value::CreateStringValue("invalid_id"));
       break;
     case PERMISSION_DENIED:
-      result_.reset(Value::CreateStringValue("permission_denied"));
+      SetResult(Value::CreateStringValue("permission_denied"));
       break;
     case INVALID_ICON_URL:
-      result_.reset(Value::CreateStringValue("invalid_icon_url"));
+      SetResult(Value::CreateStringValue("invalid_icon_url"));
       break;
     default:
       CHECK(false);
   }
 }
 
 void BeginInstallWithManifestFunction::OnWebstoreParseSuccess(
     const std::string& id,
     const SkBitmap& icon,
     DictionaryValue* parsed_manifest) {
@@ skipping 20 matching lines @@
 
 void BeginInstallWithManifestFunction::OnWebstoreParseFailure(
     const std::string& id,
     WebstoreInstallHelper::Delegate::InstallHelperResultCode result_code,
     const std::string& error_message) {
   CHECK_EQ(id_, id);
 
   // Map from WebstoreInstallHelper's result codes to ours.
   switch (result_code) {
     case WebstoreInstallHelper::Delegate::UNKNOWN_ERROR:
-      SetResult(UNKNOWN_ERROR);
+      SetResultCode(UNKNOWN_ERROR);
       break;
     case WebstoreInstallHelper::Delegate::ICON_ERROR:
-      SetResult(ICON_ERROR);
+      SetResultCode(ICON_ERROR);
       break;
     case WebstoreInstallHelper::Delegate::MANIFEST_ERROR:
-      SetResult(MANIFEST_ERROR);
+      SetResultCode(MANIFEST_ERROR);
       break;
     default:
       CHECK(false);
   }
   error_ = error_message;
   SendResponse(false);
 
   // Matches the AddRef in RunImpl().
   Release();
 }
 
 void BeginInstallWithManifestFunction::InstallUIProceed() {
   // This gets cleared in CrxInstaller::ConfirmInstall(). TODO(asargent) - in
   // the future we may also want to add time-based expiration, where a whitelist
   // entry is only valid for some number of minutes.
   scoped_ptr<WebstoreInstaller::Approval> approval(
       WebstoreInstaller::Approval::CreateWithNoInstallPrompt(
           profile(), id_, parsed_manifest_.Pass()));
   approval->use_app_installed_bubble = use_app_installed_bubble_;
   approval->record_oauth2_grant = install_prompt_->record_oauth2_grant();
   g_pending_approvals.Get().PushApproval(approval.Pass());
 
-  SetResult(ERROR_NONE);
+  SetResultCode(ERROR_NONE);
   SendResponse(true);
 
   // The Permissions_Install histogram is recorded from the ExtensionService
   // for all extension installs, so we only need to record the web store
   // specific histogram here.
   ExtensionService::RecordPermissionMessagesHistogram(
       dummy_extension_, "Extensions.Permissions_WebStoreInstall");
 
   // Matches the AddRef in RunImpl().
   Release();
 }
 
 void BeginInstallWithManifestFunction::InstallUIAbort(bool user_initiated) {
   error_ = kUserCancelledError;
-  SetResult(USER_CANCELLED);
+  SetResultCode(USER_CANCELLED);
   SendResponse(false);
 
   // The web store install histograms are a subset of the install histograms.
   // We need to record both histograms here since CrxInstaller::InstallUIAbort
   // is never called for web store install cancellations.
   std::string histogram_name = user_initiated ?
       "Extensions.Permissions_WebStoreInstallCancel" :
       "Extensions.Permissions_WebStoreInstallAbort";
   ExtensionService::RecordPermissionMessagesHistogram(
       dummy_extension_, histogram_name.c_str());
@@ skipping 106 matching lines @@
     const std::string& id, const std::string& error) {
   CHECK_EQ(id_, id);
 
   error_ = error;
   SendResponse(false);
 
   Release();  // Matches the AddRef() in RunImpl().
 }
 
 bool GetBrowserLoginFunction::RunImpl() {
-  result_.reset(CreateLoginResult(profile_->GetOriginalProfile()));
+  SetResult(CreateLoginResult(profile_->GetOriginalProfile()));
   return true;
 }
 
 bool GetStoreLoginFunction::RunImpl() {
   ExtensionService* service = profile_->GetExtensionService();
   ExtensionPrefs* prefs = service->extension_prefs();
   std::string login;
   if (prefs->GetWebStoreLogin(&login)) {
-    result_.reset(Value::CreateStringValue(login));
+    SetResult(Value::CreateStringValue(login));
   } else {
-    result_.reset(Value::CreateStringValue(std::string()));
+    SetResult(Value::CreateStringValue(std::string()));
   }
   return true;
 }
 
 bool SetStoreLoginFunction::RunImpl() {
   std::string login;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &login));
   ExtensionService* service = profile_->GetExtensionService();
   ExtensionPrefs* prefs = service->extension_prefs();
   prefs->SetWebStoreLogin(login);
   return true;
 }
 
 GetWebGLStatusFunction::GetWebGLStatusFunction() {
   feature_checker_ = new GPUFeatureChecker(
       content::GPU_FEATURE_TYPE_WEBGL,
       base::Bind(&GetWebGLStatusFunction::OnFeatureCheck, this));
 }
 
 GetWebGLStatusFunction::~GetWebGLStatusFunction() {}
 
 void GetWebGLStatusFunction::CreateResult(bool webgl_allowed) {
-  result_.reset(Value::CreateStringValue(
+  SetResult(Value::CreateStringValue(
       webgl_allowed ? "webgl_allowed" : "webgl_blocked"));
 }
 
 bool GetWebGLStatusFunction::RunImpl() {
   feature_checker_->CheckGPUFeatureAvailability();
   return true;
 }
 
 void GetWebGLStatusFunction::OnFeatureCheck(bool feature_allowed) {
   CreateResult(feature_allowed);
   SendResponse(true);
 }
 
 }  // namespace extensions