Commit 350e9c41 authored by Chris Mumford's avatar Chris Mumford Committed by Commit Bot

Revert "Fix issue that webstore private APIs return array improperly"

This reverts commit 0403341d.

Reason for revert: AutotestPrivateApiTest.AutotestPrivate is failing

https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg/19325

Apologies to developer if reverted in error.

Original change's description:
> 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: Karan Bhatia <karandeepb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#782607}

TBR=zmin@chromium.org,karandeepb@chromium.org

Change-Id: Ibe7b886da11ee5864d3b8a73b8ed7d98f53327d6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1099334
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268839Reviewed-by: default avatarChris Mumford <cmumford@google.com>
Commit-Queue: Chris Mumford <cmumford@google.com>
Cr-Commit-Position: refs/heads/master@{#782740}
parent e4367890
...@@ -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 ArgumentList(GetExtensionStatus::Results::Create(api_status)); return OneArgument(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(ArgumentList(GetExtensionStatus::Results::Create(api_status))); Respond(OneArgument(GetExtensionStatus::Results::Create(api_status)));
} }
WebstorePrivateRequestExtensionFunction:: WebstorePrivateRequestExtensionFunction::
...@@ -1178,8 +1178,7 @@ WebstorePrivateRequestExtensionFunction::Run() { ...@@ -1178,8 +1178,7 @@ WebstorePrivateRequestExtensionFunction::Run() {
api::webstore_private::ExtensionInstallStatus api_status = api::webstore_private::ExtensionInstallStatus api_status =
ConvertExtensionInstallStatusForAPI(status); ConvertExtensionInstallStatusForAPI(status);
return RespondNow( return RespondNow(OneArgument(RequestExtension::Results::Create(api_status)));
ArgumentList(RequestExtension::Results::Create(api_status)));
} }
} // namespace extensions } // namespace extensions
...@@ -135,8 +135,11 @@ class WebstorePrivateExtensionInstallRequestBase : public ExtensionApiUnittest { ...@@ -135,8 +135,11 @@ 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_string()); ASSERT_TRUE(actual_response->is_list());
EXPECT_EQ(ToString(expected_response), actual_response->GetString()); const auto& actual_list = actual_response->GetList();
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