Change Lens on Chrome Desktop to send surface as Chromium
This is the final Chrome side change to migrate from using surface as
STANDALONE_SIDE_PANEL to CHROMIUM.
go/loc-rendering-environment
Tested: Along with unit tests, manually tested that side panel appears
to render properly (no OGB) and Surface is properly propagated to the
Lens backends.
Bug: b:242102743
Change-Id: I3260024fdef9ae30cf3215811617e54c15f8ce01
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4153113
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Ali Stanfield <[email protected]>
Commit-Queue: Duncan Mercer <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1091455}
diff --git a/components/lens/lens_url_utils_unittest.cc b/components/lens/lens_url_utils_unittest.cc
index a66ad70..46186d7 100644
--- a/components/lens/lens_url_utils_unittest.cc
+++ b/components/lens/lens_url_utils_unittest.cc
@@ -22,7 +22,7 @@
std::string query_param = lens::GetQueryParametersForLensRequest(
lens_region_search_ep, /* is_side_panel_request= */ false,
/* is_full_screen_region_search_request= */ false);
- EXPECT_THAT(query_param, MatchesRegex("ep=crs&re=df&s=&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("ep=crs&re=df&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetImageSearchNewTabQueryParameterTest) {
@@ -31,7 +31,7 @@
std::string query_param = lens::GetQueryParametersForLensRequest(
lens_image_search_ep, /* is_side_panel_request= */ false,
/* is_full_screen_region_search_request= */ false);
- EXPECT_THAT(query_param, MatchesRegex("ep=ccm&re=df&s=&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("ep=ccm&re=df&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetRegionSearchSidePanelQueryParameterTest) {
@@ -40,7 +40,7 @@
std::string query_param = lens::GetQueryParametersForLensRequest(
lens_region_search_ep, /* is_side_panel_request= */ true,
/* is_full_screen_region_search_request= */ false);
- EXPECT_THAT(query_param, MatchesRegex("ep=crs&re=dcsp&s=csp&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("ep=crs&re=dcsp&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetImageSearchSidePanelQueryParameterTest) {
@@ -49,7 +49,7 @@
std::string query_param = lens::GetQueryParametersForLensRequest(
lens_image_search_ep, /* is_side_panel_request= */ true,
/* is_full_screen_region_search_request= */ false);
- EXPECT_THAT(query_param, MatchesRegex("ep=ccm&re=dcsp&s=csp&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("ep=ccm&re=dcsp&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetOpenNewTabSidePanelParameterTest) {
@@ -58,7 +58,7 @@
std::string query_param = lens::GetQueryParametersForLensRequest(
lens_open_new_tab_side_panel_ep, /* is_side_panel_request= */ false,
/* is_full_screen_region_search_request= */ false);
- EXPECT_THAT(query_param, MatchesRegex("ep=cnts&re=df&s=&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("ep=cnts&re=df&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetFullscreenSearchQueryParameterTest) {
@@ -67,21 +67,21 @@
std::string query_param = lens::GetQueryParametersForLensRequest(
lens_ep, /* is_side_panel_request= */ false,
/* is_full_screen_region_search_request= */ true);
- EXPECT_THAT(query_param, MatchesRegex("ep=cfs&re=avsf&s=&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("ep=cfs&re=avsf&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetUnknownEntryPointTest) {
std::string query_param = lens::GetQueryParametersForLensRequest(
lens::EntryPoint::UNKNOWN, /* is_side_panel_request= */ false,
/* is_full_screen_region_search_request= */ false);
- EXPECT_THAT(query_param, MatchesRegex("re=df&s=&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("re=df&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetUnknownEntryPointSidePanelTest) {
std::string query_param = lens::GetQueryParametersForLensRequest(
lens::EntryPoint::UNKNOWN, /* is_side_panel_request= */ true,
/* is_full_screen_region_search_request= */ false);
- EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=csp&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendRegionSearchNewTabQueryParameterTest) {
@@ -93,7 +93,7 @@
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, lens_region_search_ep, re,
/* is_side_panel_request= */ false);
- EXPECT_THAT(url.query(), MatchesRegex("ep=crs&re=df&s=&st=\\d+"));
+ EXPECT_THAT(url.query(), MatchesRegex("ep=crs&re=df&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendImageSearchNewTabQueryParameterTest) {
@@ -105,7 +105,7 @@
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, lens_image_search_ep, re,
/* is_side_panel_request= */ false);
- EXPECT_THAT(url.query(), MatchesRegex("ep=ccm&re=df&s=&st=\\d+"));
+ EXPECT_THAT(url.query(), MatchesRegex("ep=ccm&re=df&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendRegionSearchSidePanelQueryParameterTest) {
@@ -117,7 +117,7 @@
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, lens_region_search_ep, re,
/* is_side_panel_request= */ true);
- EXPECT_THAT(url.query(), MatchesRegex("ep=crs&re=dcsp&s=csp&st=\\d+"));
+ EXPECT_THAT(url.query(), MatchesRegex("ep=crs&re=dcsp&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendImageSearchSidePanelQueryParameterTest) {
@@ -129,7 +129,7 @@
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, lens_image_search_ep, re,
/* is_side_panel_request= */ true);
- EXPECT_THAT(url.query(), MatchesRegex("ep=ccm&re=dcsp&s=csp&st=\\d+"));
+ EXPECT_THAT(url.query(), MatchesRegex("ep=ccm&re=dcsp&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendOpenNewTabSidePanelParameterTest) {
@@ -141,7 +141,7 @@
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, lens_open_new_tab_side_panel_ep, re,
/* is_side_panel_request= */ false);
- EXPECT_THAT(url.query(), MatchesRegex("ep=cnts&re=df&s=&st=\\d+"));
+ EXPECT_THAT(url.query(), MatchesRegex("ep=cnts&re=df&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendFullscreenSearchQueryParameterTest) {
@@ -152,7 +152,7 @@
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, lens_ep, re, /* is_side_panel_request= */ false);
- EXPECT_THAT(url.query(), MatchesRegex("ep=cfs&re=avsf&s=&st=\\d+"));
+ EXPECT_THAT(url.query(), MatchesRegex("ep=cfs&re=avsf&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendUnknownEntryPointTest) {
@@ -162,7 +162,7 @@
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, lens::EntryPoint::UNKNOWN, re,
/* is_side_panel_request= */ false);
- EXPECT_THAT(url.query(), MatchesRegex("re=df&s=&st=\\d+"));
+ EXPECT_THAT(url.query(), MatchesRegex("re=df&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendUnknownRenderingEnvironmentTest) {
@@ -171,7 +171,7 @@
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, ep, lens::RenderingEnvironment::RENDERING_ENV_UNKNOWN,
/* is_side_panel_request= */ false);
- EXPECT_THAT(url.query(), MatchesRegex("ep=crs&s=&st=\\d+"));
+ EXPECT_THAT(url.query(), MatchesRegex("ep=crs&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendEmptyLogsTest) {
@@ -180,9 +180,9 @@
lens::EntryPoint::UNKNOWN,
/* is_side_panel_request= */ true,
/* is_full_screen_region_search_request= */ false);
- EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=csp&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=4&st=\\d+"));
lens::AppendLogsQueryParam(&query_param, std::move(log_data));
- EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=csp&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, AppendPopulatedLogsTest) {
@@ -194,9 +194,9 @@
lens::EntryPoint::UNKNOWN,
/* is_side_panel_request= */ true,
/* is_full_screen_region_search_request= */ false);
- EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=csp&st=\\d+"));
+ EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=4&st=\\d+"));
lens::AppendLogsQueryParam(&query_param, std::move(log_data));
- EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=csp&st=\\d+&lm.+"));
+ EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=4&st=\\d+&lm.+"));
}
} // namespace lens
