Revert "Unified Side Panel: Add image search key/value to json struct."
This reverts commit dec15ed8f48265ad21bbd4ec4463a5e4c3372345.
Reason for revert: breaks on linux-chromeos-chrome, see https://ci.chromium.org/ui/p/chrome/builders/ci/linux-chromeos-chrome/24737/overview
Original change's description:
> Unified Side Panel: Add image search key/value to json struct.
>
> Added a new image search param to the json file and will use that to direct image search and region search requests to the unified side panel for search engines.
>
> Design Doc: go/unified-side-panel-non-google-dse
>
> - Direct 3P DSE requests to side panel only if the image search param exists and the unified side panel is turned on.
> - If the unified side panel flag is turned off, the 3P DSE requests are redirected to a new tab.
> - For lens requests, standardize the way rendering env variable query param gets added.
> - Use default vector image search icon for the 3P DSE's.
> - Changing Search Engine when side panel is opened closes side panel and de-registers lens.
>
> For testing purposes, enabled side panel for Bing search engine and here are the demos:
>
> Region Search: https://drive.google.com/file/d/1wKde02oZL6EeFCJYwdPLfKo_p9qST-mE/view
>
> Image Search: https://drive.google.com/file/d/116hIj5fWda_hKZ_2VHa-L50gNWMsjAg9/view
>
> Changing Search Engine: https://drive.google.com/file/d/1lgO7yUV-pA6jpSXH6gZdFVT7-vGfqXh3/view
>
> NOTE: The existing browser tests for the lens unified side panel are broken, so did not add new browser tests for 3P DSE's, we will add them when fixing the browser tests in b/242909164.
>
> Bug: b/226186680
> Change-Id: I268eb7d673e02d6a0a77838280f1c7014367f314
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3866097
> Commit-Queue: Anudeep Palanki <[email protected]>
> Reviewed-by: Ali Stanfield <[email protected]>
> Reviewed-by: Evan Stade <[email protected]>
> Reviewed-by: Orin Jaworski <[email protected]>
> Reviewed-by: Avi Drissman <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1045182}
Bug: b/226186680
Change-Id: I2bb922204f51bdb012eb6c0be120f76e1029e8c2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3887281
Owners-Override: Dominique Fauteux-Chapleau <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Commit-Queue: Dominique Fauteux-Chapleau <[email protected]>
Auto-Submit: Dominique Fauteux-Chapleau <[email protected]>
Commit-Queue: Rubber Stamper <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1045241}
diff --git a/components/lens/lens_url_utils_unittest.cc b/components/lens/lens_url_utils_unittest.cc
index 653ebfe..b289440a 100644
--- a/components/lens/lens_url_utils_unittest.cc
+++ b/components/lens/lens_url_utils_unittest.cc
@@ -19,79 +19,96 @@
TEST(LensUrlUtilsTest, GetRegionSearchNewTabQueryParameterTest) {
lens::EntryPoint lens_region_search_ep =
lens::EntryPoint::CHROME_REGION_SEARCH_MENU_ITEM;
+ lens::RenderingEnvironment re =
+ lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
std::string query_param = lens::GetQueryParametersForLensRequest(
- lens_region_search_ep, /* is_side_panel_request= */ false,
- /* is_full_screen_region_search_request= */ false);
+ lens_region_search_ep, re, /*is_side_panel_request=*/false);
EXPECT_THAT(query_param, MatchesRegex("ep=crs&re=df&s=&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetImageSearchNewTabQueryParameterTest) {
lens::EntryPoint lens_image_search_ep =
lens::EntryPoint::CHROME_SEARCH_WITH_GOOGLE_LENS_CONTEXT_MENU_ITEM;
+ lens::RenderingEnvironment re =
+ lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
std::string query_param = lens::GetQueryParametersForLensRequest(
- lens_image_search_ep, /* is_side_panel_request= */ false,
- /* is_full_screen_region_search_request= */ false);
+ lens_image_search_ep, re, /*is_side_panel_request=*/false);
EXPECT_THAT(query_param, MatchesRegex("ep=ccm&re=df&s=&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetRegionSearchSidePanelQueryParameterTest) {
lens::EntryPoint lens_region_search_ep =
lens::EntryPoint::CHROME_REGION_SEARCH_MENU_ITEM;
+ lens::RenderingEnvironment re =
+ lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_CHROME_SIDE_PANEL;
std::string query_param = lens::GetQueryParametersForLensRequest(
- lens_region_search_ep, /* is_side_panel_request= */ true,
- /* is_full_screen_region_search_request= */ false);
+ lens_region_search_ep, re, /*is_side_panel_request=*/true);
EXPECT_THAT(query_param, MatchesRegex("ep=crs&re=dcsp&s=csp&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetImageSearchSidePanelQueryParameterTest) {
lens::EntryPoint lens_image_search_ep =
lens::EntryPoint::CHROME_SEARCH_WITH_GOOGLE_LENS_CONTEXT_MENU_ITEM;
+ lens::RenderingEnvironment re =
+ lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_CHROME_SIDE_PANEL;
std::string query_param = lens::GetQueryParametersForLensRequest(
- lens_image_search_ep, /* is_side_panel_request= */ true,
- /* is_full_screen_region_search_request= */ false);
+ lens_image_search_ep, re, /*is_side_panel_request=*/true);
EXPECT_THAT(query_param, MatchesRegex("ep=ccm&re=dcsp&s=csp&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetOpenNewTabSidePanelParameterTest) {
lens::EntryPoint lens_open_new_tab_side_panel_ep =
lens::EntryPoint::CHROME_OPEN_NEW_TAB_SIDE_PANEL;
+ lens::RenderingEnvironment re =
+ lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
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);
+ lens_open_new_tab_side_panel_ep, re, /*is_side_panel_request=*/false);
EXPECT_THAT(query_param, MatchesRegex("ep=cnts&re=df&s=&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetFullscreenSearchQueryParameterTest) {
lens::EntryPoint lens_ep =
lens::EntryPoint::CHROME_FULLSCREEN_SEARCH_MENU_ITEM;
+ lens::RenderingEnvironment re =
+ lens::RenderingEnvironment::ONELENS_AMBIENT_VISUAL_SEARCH_WEB_FULLSCREEN;
std::string query_param = lens::GetQueryParametersForLensRequest(
- lens_ep, /* is_side_panel_request= */ false,
- /* is_full_screen_region_search_request= */ true);
+ lens_ep, re, /*is_side_panel_request=*/false);
EXPECT_THAT(query_param, MatchesRegex("ep=cfs&re=avsf&s=&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetScreenshotSearchQueryParameterTest) {
lens::EntryPoint lens_ep = lens::EntryPoint::CHROME_SCREENSHOT_SEARCH;
+ lens::RenderingEnvironment re =
+ lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
std::string query_param = lens::GetQueryParametersForLensRequest(
- lens_ep, /* is_side_panel_request= */ false,
- /* is_full_screen_region_search_request= */ false);
+ lens_ep, re, /*is_side_panel_request=*/false);
EXPECT_THAT(query_param, MatchesRegex("ep=css&re=df&s=&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetUnknownEntryPointTest) {
+ lens::RenderingEnvironment re =
+ lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
std::string query_param = lens::GetQueryParametersForLensRequest(
- lens::EntryPoint::UNKNOWN, /* is_side_panel_request= */ false,
- /* is_full_screen_region_search_request= */ false);
+ lens::EntryPoint::UNKNOWN, re, /*is_side_panel_request=*/false);
EXPECT_THAT(query_param, MatchesRegex("re=df&s=&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetUnknownEntryPointSidePanelTest) {
+ lens::RenderingEnvironment re =
+ lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_CHROME_SIDE_PANEL;
std::string query_param = lens::GetQueryParametersForLensRequest(
- lens::EntryPoint::UNKNOWN, /* is_side_panel_request= */ true,
- /* is_full_screen_region_search_request= */ false);
+ lens::EntryPoint::UNKNOWN, re, /*is_side_panel_request=*/true);
EXPECT_THAT(query_param, MatchesRegex("re=dcsp&s=csp&st=\\d+"));
}
+TEST(LensUrlUtilsTest, GetUnknownRenderingEnvironmentTest) {
+ lens::EntryPoint ep = lens::EntryPoint::CHROME_REGION_SEARCH_MENU_ITEM;
+ std::string query_param = lens::GetQueryParametersForLensRequest(
+ ep, lens::RenderingEnvironment::RENDERING_ENV_UNKNOWN,
+ /*is_side_panel_request=*/false);
+ EXPECT_THAT(query_param, MatchesRegex("ep=crs&s=&st=\\d+"));
+}
+
TEST(LensUrlUtilsTest, AppendRegionSearchNewTabQueryParameterTest) {
lens::EntryPoint lens_region_search_ep =
lens::EntryPoint::CHROME_REGION_SEARCH_MENU_ITEM;
@@ -99,8 +116,7 @@
lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_region_search_ep, re,
- /* is_side_panel_request= */ false);
+ original_url, lens_region_search_ep, re, /*is_side_panel_request=*/false);
EXPECT_THAT(url.query(), MatchesRegex("ep=crs&re=df&s=&st=\\d+"));
}
@@ -111,8 +127,7 @@
lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_image_search_ep, re,
- /* is_side_panel_request= */ false);
+ original_url, lens_image_search_ep, re, /*is_side_panel_request=*/false);
EXPECT_THAT(url.query(), MatchesRegex("ep=ccm&re=df&s=&st=\\d+"));
}
@@ -123,8 +138,7 @@
lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_CHROME_SIDE_PANEL;
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_region_search_ep, re,
- /* is_side_panel_request= */ true);
+ 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+"));
}
@@ -135,8 +149,7 @@
lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_CHROME_SIDE_PANEL;
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_image_search_ep, re,
- /* is_side_panel_request= */ true);
+ 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+"));
}
@@ -148,7 +161,7 @@
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, lens_open_new_tab_side_panel_ep, re,
- /* is_side_panel_request= */ false);
+ /*is_side_panel_request=*/false);
EXPECT_THAT(url.query(), MatchesRegex("ep=cnts&re=df&s=&st=\\d+"));
}
@@ -159,7 +172,7 @@
lens::RenderingEnvironment::ONELENS_AMBIENT_VISUAL_SEARCH_WEB_FULLSCREEN;
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_ep, re, /* is_side_panel_request= */ false);
+ original_url, lens_ep, re, /*is_side_panel_request=*/false);
EXPECT_THAT(url.query(), MatchesRegex("ep=cfs&re=avsf&s=&st=\\d+"));
}
@@ -169,7 +182,7 @@
lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_ep, re, /* is_side_panel_request= */ false);
+ original_url, lens_ep, re, /*is_side_panel_request=*/false);
EXPECT_THAT(url.query(), MatchesRegex("ep=css&re=df&s=&st=\\d+"));
}
@@ -179,7 +192,7 @@
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, lens::EntryPoint::UNKNOWN, re,
- /* is_side_panel_request= */ false);
+ /*is_side_panel_request=*/false);
EXPECT_THAT(url.query(), MatchesRegex("re=df&s=&st=\\d+"));
}
@@ -188,7 +201,7 @@
GURL original_url = GURL("https://lens.google.com/");
GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
original_url, ep, lens::RenderingEnvironment::RENDERING_ENV_UNKNOWN,
- /* is_side_panel_request= */ false);
+ /*is_side_panel_request=*/false);
EXPECT_THAT(url.query(), MatchesRegex("ep=crs&s=&st=\\d+"));
}
