7b88adc202b3f0352e1403cb55ff2ce54eeebea8 - chromium/src

[nancyl...@chromium.org]

commit 7b88adc202b3f0352e1403cb55ff2ce54eeebea8
Author: Nancy Wang <nancyl...@chromium.org>
AuthorDate: Tue Mar 01 23:48:04 2022
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Tue Mar 01 23:48:04 2022

Replace AppUpdate::GetHandlesIntents with AppUpdate::HandlesIntents.

This CL modifies AppUpdate::HandlesIntents to get value from the non
mojom App struct when it is available, and remove
AppUpdate::GetHandlesIntents.

Modify tests to use and verify AppUpdate::HandlesIntents.

BUG=1253250

Change-Id: I2cc9b458444b0ae13afbb6d0360bb1b641275a9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3497721
Reviewed-by: Dominick Ng <domi...@chromium.org>
Commit-Queue: Nancy Wang <nancyl...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#976472}

diff --git a/chrome/browser/apps/app_service/app_service_proxy_base.cc b/chrome/browser/apps/app_service/app_service_proxy_base.cc
index 4cfbbaa..64dc174 100644
--- a/chrome/browser/apps/app_service/app_service_proxy_base.cc
+++ b/chrome/browser/apps/app_service/app_service_proxy_base.cc
@@ -512,7 +512,7 @@
// loads to be blocked.
return;
}
- if (update.HandlesIntents() != apps::mojom::OptionalBool::kTrue) {
+ if (!update.HandlesIntents().value_or(false)) {
return;
}
if (exclude_browser_tab_apps &&
diff --git a/chrome/browser/web_applications/system_web_apps/test/system_web_app_manager_browsertest.cc b/chrome/browser/web_applications/system_web_apps/test/system_web_app_manager_browsertest.cc
index f79b0d0..cf6f30d 100644
--- a/chrome/browser/web_applications/system_web_apps/test/system_web_app_manager_browsertest.cc
+++ b/chrome/browser/web_applications/system_web_apps/test/system_web_app_manager_browsertest.cc
@@ -966,7 +966,7 @@
GetAppServiceProxy(browser()->profile())
->AppRegistryCache()
.ForOneApp(app_id, [](const apps::AppUpdate& update) {
- EXPECT_EQ(apps::mojom::OptionalBool::kTrue, update.HandlesIntents());
+ EXPECT_TRUE(update.HandlesIntents().value_or(false));
});
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
}
diff --git a/components/services/app_service/public/cpp/app_update.cc b/components/services/app_service/public/cpp/app_update.cc
index b0531b2..de20326 100644
--- a/components/services/app_service/public/cpp/app_update.cc
+++ b/components/services/app_service/public/cpp/app_update.cc
@@ -800,19 +800,12 @@
mojom_state_->show_in_management));
}

-apps::mojom::OptionalBool AppUpdate::HandlesIntents() const {
- if (mojom_delta_ &&
- (mojom_delta_->handles_intents != apps::mojom::OptionalBool::kUnknown)) {
- return mojom_delta_->handles_intents;
+absl::optional<bool> AppUpdate::HandlesIntents() const {
+ if (ShouldUseNonMojom()) {
+ GET_VALUE_WITH_FALLBACK(handles_intents, absl::nullopt)
}
- if (mojom_state_) {
- return mojom_state_->handles_intents;
- }
- return apps::mojom::OptionalBool::kUnknown;
-}

-absl::optional<bool> AppUpdate::GetHandlesIntents() const {
- GET_VALUE_WITH_FALLBACK(handles_intents, absl::nullopt)
+ CONVERT_MOJOM_OPTIONALBOOL_TO_OPTIONAL_VALUE(handles_intents)
}

bool AppUpdate::HandlesIntentsChanged() const {
@@ -1049,7 +1042,8 @@
out << "ShowInSearch: " << app.ShowInSearch() << std::endl;
out << "ShowInManagement: " << PRINT_OPTIONAL_VALUE(ShowInManagement)
<< std::endl;
- out << "HandlesIntents: " << app.HandlesIntents() << std::endl;
+ out << "HandlesIntents: " << PRINT_OPTIONAL_VALUE(HandlesIntents)
+ << std::endl;
out << "AllowUninstall: " << PRINT_OPTIONAL_VALUE(AllowUninstall)
<< std::endl;
out << "HasBadge: " << app.HasBadge() << std::endl;
diff --git a/components/services/app_service/public/cpp/app_update.h b/components/services/app_service/public/cpp/app_update.h
index 05b8254..37902fb 100644
--- a/components/services/app_service/public/cpp/app_update.h
+++ b/components/services/app_service/public/cpp/app_update.h
@@ -158,8 +158,7 @@
absl::optional<bool> ShowInManagement() const;
bool ShowInManagementChanged() const;

- apps::mojom::OptionalBool HandlesIntents() const;
- absl::optional<bool> GetHandlesIntents() const;
+ absl::optional<bool> HandlesIntents() const;
bool HandlesIntentsChanged() const;

absl::optional<bool> AllowUninstall() const;
diff --git a/components/services/app_service/public/cpp/app_update_mojom_unittest.cc b/components/services/app_service/public/cpp/app_update_mojom_unittest.cc
index 6c57b7cf..6081888 100644
--- a/components/services/app_service/public/cpp/app_update_mojom_unittest.cc
+++ b/components/services/app_service/public/cpp/app_update_mojom_unittest.cc
@@ -90,7 +90,7 @@
absl::optional<bool> expect_show_in_management_;
bool expect_show_in_management_changed_;

- apps::mojom::OptionalBool expect_handles_intents_;
+ absl::optional<bool> expect_handles_intents_;
bool expect_handles_intents_changed_;

absl::optional<bool> expect_allow_uninstall_;
@@ -280,7 +280,7 @@
expect_show_in_shelf_ = apps::mojom::OptionalBool::kUnknown;
expect_show_in_search_ = apps::mojom::OptionalBool::kUnknown;
expect_show_in_management_ = absl::nullopt;
- expect_handles_intents_ = apps::mojom::OptionalBool::kUnknown;
+ expect_handles_intents_ = absl::nullopt;
expect_allow_uninstall_ = absl::nullopt;
expect_has_badge_ = apps::mojom::OptionalBool::kUnknown;
expect_paused_ = absl::nullopt;
@@ -735,14 +735,14 @@

if (state) {
state->handles_intents = apps::mojom::OptionalBool::kFalse;
- expect_handles_intents_ = apps::mojom::OptionalBool::kFalse;
+ expect_handles_intents_ = false;
expect_handles_intents_changed_ = false;
CheckExpects(u);
}

if (delta) {
delta->handles_intents = apps::mojom::OptionalBool::kTrue;
- expect_handles_intents_ = apps::mojom::OptionalBool::kTrue;
+ expect_handles_intents_ = true;
expect_handles_intents_changed_ = true;
CheckExpects(u);
}
diff --git a/components/services/app_service/public/cpp/app_update_unittest.cc b/components/services/app_service/public/cpp/app_update_unittest.cc
index f82d308..5cd2c8e 100644
--- a/components/services/app_service/public/cpp/app_update_unittest.cc
+++ b/components/services/app_service/public/cpp/app_update_unittest.cc
@@ -233,7 +233,7 @@
EXPECT_EQ(expect_show_in_management_, u.ShowInManagement());
EXPECT_EQ(expect_show_in_management_changed_, u.ShowInManagementChanged());

- EXPECT_EQ(expect_handles_intents_, u.GetHandlesIntents());
+ EXPECT_EQ(expect_handles_intents_, u.HandlesIntents());
EXPECT_EQ(expect_handles_intents_changed_, u.HandlesIntentsChanged());

EXPECT_EQ(expect_allow_uninstall_, u.AllowUninstall());