Commit 0403341d authored by Owen Min's avatar Owen Min Committed by Commit Bot

Fix issue that webstore private APIs return array improperly

webstorePrivate.getExtensionStatus and requestExtension should return
extension status as a string but not an array of string.

Bug: 1099334
Change-Id: Ib56e466cc1d967e3a322494076ad7640a6868aac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2267719
Commit-Queue: Owen Min <zmin@chromium.org>
Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782607}
parent 41c3ed1b
...@@ -1121,7 +1121,7 @@ WebstorePrivateGetExtensionStatusFunction::BuildResponseWithoutManifest( ...@@ -1121,7 +1121,7 @@ WebstorePrivateGetExtensionStatusFunction::BuildResponseWithoutManifest(
GetWebstoreExtensionInstallStatus(extension_id, profile); GetWebstoreExtensionInstallStatus(extension_id, profile);
api::webstore_private::ExtensionInstallStatus api_status = api::webstore_private::ExtensionInstallStatus api_status =
ConvertExtensionInstallStatusForAPI(status); ConvertExtensionInstallStatusForAPI(status);
return OneArgument(GetExtensionStatus::Results::Create(api_status)); return ArgumentList(GetExtensionStatus::Results::Create(api_status));
} }
void WebstorePrivateGetExtensionStatusFunction::OnManifestParsed( void WebstorePrivateGetExtensionStatusFunction::OnManifestParsed(
...@@ -1153,7 +1153,7 @@ void WebstorePrivateGetExtensionStatusFunction::OnManifestParsed( ...@@ -1153,7 +1153,7 @@ void WebstorePrivateGetExtensionStatusFunction::OnManifestParsed(
PermissionsParser::GetRequiredPermissions(dummy_extension.get())); PermissionsParser::GetRequiredPermissions(dummy_extension.get()));
api::webstore_private::ExtensionInstallStatus api_status = api::webstore_private::ExtensionInstallStatus api_status =
ConvertExtensionInstallStatusForAPI(status); ConvertExtensionInstallStatusForAPI(status);
Respond(OneArgument(GetExtensionStatus::Results::Create(api_status))); Respond(ArgumentList(GetExtensionStatus::Results::Create(api_status)));
} }
WebstorePrivateRequestExtensionFunction:: WebstorePrivateRequestExtensionFunction::
...@@ -1178,7 +1178,8 @@ WebstorePrivateRequestExtensionFunction::Run() { ...@@ -1178,7 +1178,8 @@ WebstorePrivateRequestExtensionFunction::Run() {
api::webstore_private::ExtensionInstallStatus api_status = api::webstore_private::ExtensionInstallStatus api_status =
ConvertExtensionInstallStatusForAPI(status); ConvertExtensionInstallStatusForAPI(status);
return RespondNow(OneArgument(RequestExtension::Results::Create(api_status))); return RespondNow(
ArgumentList(RequestExtension::Results::Create(api_status)));
} }
} // namespace extensions } // namespace extensions
...@@ -135,11 +135,8 @@ class WebstorePrivateExtensionInstallRequestBase : public ExtensionApiUnittest { ...@@ -135,11 +135,8 @@ class WebstorePrivateExtensionInstallRequestBase : public ExtensionApiUnittest {
void VerifyResponse(const ExtensionInstallStatus& expected_response, void VerifyResponse(const ExtensionInstallStatus& expected_response,
const base::Value* actual_response) { const base::Value* actual_response) {
ASSERT_TRUE(actual_response->is_list()); ASSERT_TRUE(actual_response->is_string());
const auto& actual_list = actual_response->GetList(); EXPECT_EQ(ToString(expected_response), actual_response->GetString());
ASSERT_EQ(1u, actual_list.size());
ASSERT_TRUE(actual_list[0].is_string());
EXPECT_EQ(ToString(expected_response), actual_list[0].GetString());
} }
private: private:
......
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