chromium/src
0
Fork 0
Code Activity

update_client: Fix zucchini operation identifier.

Browse Source 
The protocol document was inconsistent about the name, but the server
implemented "zucc".

Bug: 399619105
Change-Id: I6a71b7b9933b8ec187e50df2a8ae833230989ba2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6438693
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Reviewed-by: Noah Rose Ledesma <noahrose@google.com>
Commit-Queue: Noah Rose Ledesma <noahrose@google.com>
Auto-Submit: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1443645}
This commit is contained in:
Joshua Pawlicki
2025-04-07 11:32:44 -07:00
committed by Chromium LUCI CQ
parent ae9f75c6a2
commit 6797e59d31
6 changed files with 7 additions and 7 deletions

2
components/update_client/ping_manager_unittest.cc

@ -154,7 +154,7 @@ TEST_P(PingManagerTest, SendPing) {
EXPECT_TRUE(request.contains("@os"));
EXPECT_EQ("fake_prodid", CHECK_DEREF(request.FindString("@updater")));
EXPECT_EQ("crx3,download,puff,run,xz,zucchini",
EXPECT_EQ("crx3,download,puff,run,xz,zucc",
CHECK_DEREF(request.FindString("acceptformat")));
EXPECT_TRUE(request.contains("arch"));
EXPECT_EQ("cr", CHECK_DEREF(request.FindString("dedup")));

2
components/update_client/pipeline.cc

@ -262,7 +262,7 @@ std::queue<Operation> MakeOperations(
cache_check,
base::BindOnce(&XzOperation, config->GetUnzipperFactory()->Create(),
event_adder)));
} else if (operation.type == "zucchini") {
} else if (operation.type == "zucc") {
ops.push(SkipIfCached(
cache_check, base::BindOnce(&ZucchiniOperation, crx_cache,
config->GetPatcherFactory()->Create(),

2
components/update_client/protocol_serializer_json.cc

@ -24,7 +24,7 @@ std::string ProtocolSerializerJSON::Serialize(
request_node.Set("protocol", request.protocol_version);
request_node.Set("ismachine", request.is_machine);
request_node.Set("dedup", "cr");
request_node.Set("acceptformat", "crx3,download,puff,run,xz,zucchini");
request_node.Set("acceptformat", "crx3,download,puff,run,xz,zucc");
if (!request.additional_attributes.empty()) {
for (const auto& [name, value] : request.additional_attributes) {
request_node.Set(name, value);

4
components/update_client/protocol_serializer_json_unittest.cc

@ -62,7 +62,7 @@ TEST(SerializeRequestJSON, Serialize) {
std::move(apps)));
constexpr char regex[] =
R"({"request":{"@os":"\w+","@updater":"prod_id",)"
R"("acceptformat":"crx3,download,puff,run,xz,zucchini",)"
R"("acceptformat":"crx3,download,puff,run,xz,zucc",)"
R"("apps":\[{"ap":"ap1","appid":"id1","attr1":"1","attr2":"2",)"
R"("brand":"BRND","cohort":"c1","cohorthint":"ch1","cohortname":"cn1",)"
R"("data":\[{"index":"foobar_install_data_index","name":"install"}],)"
@ -147,7 +147,7 @@ TEST(SerializeRequestJSON, UpdaterStateAttributes) {
{}));
constexpr char regex[] =
R"({"request":{"@os":"\w+","@updater":"prod_id",)"
R"("acceptformat":"crx3,download,puff,run,xz,zucchini",)"
R"("acceptformat":"crx3,download,puff,run,xz,zucc",)"
R"("arch":"\w+","dedup":"cr",)"
R"("dlpref":"cacheable","domainjoined":true,"extra":"params",)"
R"("hw":{"avx":(true|false),)"

2
components/update_client/update_checker_unittest.cc

@ -284,7 +284,7 @@ TEST_P(UpdateCheckerTest, UpdateCheckSuccess) {
ASSERT_TRUE(request->FindString("@updater"));
EXPECT_EQ("fake_prodid", *request->FindString("@updater"));
ASSERT_TRUE(request->FindString("acceptformat"));
EXPECT_EQ("crx3,download,puff,run,xz,zucchini",
EXPECT_EQ("crx3,download,puff,run,xz,zucc",
*request->FindString("acceptformat"));
EXPECT_TRUE(request->contains("arch"));
ASSERT_TRUE(request->FindString("dedup"));

2
docs/updater/protocol_4.md

@ -833,7 +833,7 @@ attmpted as part of this update session. All events have the following members:
* 4: An uninstall session.
* 14: A `download` operation.
* 60: An `xz` operation.
* 61: A `zucchini` patch application operation.
* 61: A `zucc` patch application operation.
* 62: A `puffin` patch application operation.
* 63: A `crx3` package installation operation.
* 41: An app command completion event.