Added support for multiple parameters to Extension API callbacks.

chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

Index: chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
index 1d11a788b5647b1971f8317a87c1be8fcabd010c..e7b5fc1fbd05a934929424d75cb4f2c6cc0d603c 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -260,7 +260,7 @@ bool BeginInstallWithManifestFunction::RunImpl() {
 
   EXTENSION_FUNCTION_VALIDATE(details->GetString(kIdKey, &id_));
   if (!extensions::Extension::IdIsValid(id_)) {
-    SetResult(INVALID_ID);
+    SetResultCode(INVALID_ID);
     error_ = kInvalidIdError;
     return false;
   }
@@ -268,7 +268,7 @@ bool BeginInstallWithManifestFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(details->GetString(kManifestKey, &manifest_));
 
   if (details->HasKey(kIconDataKey) && details->HasKey(kIconUrlKey)) {
-    SetResult(ICON_ERROR);
+    SetResultCode(ICON_ERROR);
     error_ = kCannotSpecifyIconDataAndUrlError;
     return false;
   }
@@ -282,7 +282,7 @@ bool BeginInstallWithManifestFunction::RunImpl() {
     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;
     }
@@ -316,31 +316,31 @@ bool BeginInstallWithManifestFunction::RunImpl() {
 }
 
 
-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);
@@ -381,13 +381,13 @@ void BeginInstallWithManifestFunction::OnWebstoreParseFailure(
   // 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);
@@ -410,7 +410,7 @@ void BeginInstallWithManifestFunction::InstallUIProceed() {
   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
@@ -425,7 +425,7 @@ void BeginInstallWithManifestFunction::InstallUIProceed() {
 
 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.
@@ -552,7 +552,7 @@ void SilentlyInstallFunction::OnExtensionInstallFailure(
 }
 
 bool GetBrowserLoginFunction::RunImpl() {
-  result_.reset(CreateLoginResult(profile_->GetOriginalProfile()));
+  SetResult(CreateLoginResult(profile_->GetOriginalProfile()));
   return true;
 }
 
@@ -561,9 +561,9 @@ bool GetStoreLoginFunction::RunImpl() {
   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;
 }
@@ -586,7 +586,7 @@ GetWebGLStatusFunction::GetWebGLStatusFunction() {
 GetWebGLStatusFunction::~GetWebGLStatusFunction() {}
 
 void GetWebGLStatusFunction::CreateResult(bool webgl_allowed) {
-  result_.reset(Value::CreateStringValue(
+  SetResult(Value::CreateStringValue(
       webgl_allowed ? "webgl_allowed" : "webgl_blocked"));
 }