[Lens SP Cleanup][3/n] Remove remaining Lens side panel references
Also removes now unused util methods and their testing.
Change-Id: I6d0fc4a97fc3827f159bb2d51f7c149051695ebd
Fixed: 378118608
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6039450
Reviewed-by: Erik Chen <[email protected]>
Commit-Queue: Duncan Mercer <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1387730}
diff --git a/components/lens/lens_url_utils_unittest.cc b/components/lens/lens_url_utils_unittest.cc
index 001e325..d6e8a26 100644
--- a/components/lens/lens_url_utils_unittest.cc
+++ b/components/lens/lens_url_utils_unittest.cc
@@ -8,7 +8,6 @@
#include "base/test/metrics/histogram_tester.h"
#include "base/time/time.h"
#include "components/lens/lens_entrypoints.h"
-#include "components/lens/lens_rendering_environment.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@@ -17,198 +16,41 @@
namespace lens {
-TEST(LensUrlUtilsTest, NonSidePanelRequestHasNoSidePanelSizeParams) {
+TEST(LensUrlUtilsTest, GetRegionSearchParameterTest) {
lens::EntryPoint lens_region_search_ep =
lens::EntryPoint::CHROME_REGION_SEARCH_MENU_ITEM;
std::string query_param =
- lens::GetQueryParametersForLensRequest(lens_region_search_ep,
- /*is_full_screen_request=*/false);
-
- // Despite passing in a nonzero size, there should not be any side panel
- // viewport size params.
+ lens::GetQueryParametersForLensRequest(lens_region_search_ep);
EXPECT_THAT(query_param, MatchesRegex("ep=crs&re=df&s=4&st=\\d+"));
}
-TEST(LensUrlUtilsTest,
- AppendOrReplaceViewportSizeForRequestSetsSidePanelSizeParams) {
- base::HistogramTester histogram_tester;
- GURL original_url = GURL("https://lens.google.com/");
- GURL url = lens::AppendOrReplaceViewportSizeForRequest(original_url,
- gfx::Size(10, 10));
- EXPECT_THAT(url.query(), MatchesRegex("vpw=10&vph=10"));
- histogram_tester.ExpectBucketCount(
- "Search.Lens.ViewportDimensionsSent.Success", true, 1);
-}
-
-TEST(LensUrlUtilsTest,
- AppendOrReplaceViewportSizeForRequestOnlySetsNonZeroSizes) {
- base::HistogramTester histogram_tester;
- GURL original_url = GURL("https://lens.google.com/");
- GURL url_with_height = lens::AppendOrReplaceViewportSizeForRequest(
- original_url, gfx::Size(0, 10));
- EXPECT_THAT(url_with_height.query(), MatchesRegex("vph=10"));
- GURL url_with_width = lens::AppendOrReplaceViewportSizeForRequest(
- original_url, gfx::Size(10, 0));
- EXPECT_THAT(url_with_width.query(), MatchesRegex("vpw=10"));
- GURL url_with_neither = lens::AppendOrReplaceViewportSizeForRequest(
- original_url, gfx::Size(0, 0));
- EXPECT_THAT(url_with_neither.query(), MatchesRegex(""));
- histogram_tester.ExpectBucketCount(
- "Search.Lens.ViewportDimensionsSent.Success", false, 3);
-}
-
-TEST(LensUrlUtilsTest, GetRegionSearchNewTabQueryParameterTest) {
- lens::EntryPoint lens_region_search_ep =
- lens::EntryPoint::CHROME_REGION_SEARCH_MENU_ITEM;
- std::string query_param =
- lens::GetQueryParametersForLensRequest(lens_region_search_ep,
- /*is_full_screen_request=*/false);
- EXPECT_THAT(query_param, MatchesRegex("ep=crs&re=df&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, GetImageSearchNewTabQueryParameterTest) {
+TEST(LensUrlUtilsTest, GetImageSearcParameterTest) {
lens::EntryPoint lens_image_search_ep =
lens::EntryPoint::CHROME_SEARCH_WITH_GOOGLE_LENS_CONTEXT_MENU_ITEM;
std::string query_param =
- lens::GetQueryParametersForLensRequest(lens_image_search_ep,
- /*is_full_screen_request=*/false);
+ lens::GetQueryParametersForLensRequest(lens_image_search_ep);
EXPECT_THAT(query_param, MatchesRegex("ep=ccm&re=df&s=4&st=\\d+"));
}
-TEST(LensUrlUtilsTest, GetImageTranslateNewTabQueryParameterTest) {
+// TODO(378584534): Remove this test once the Lens entrypoint is updated.
+TEST(LensUrlUtilsTest, GetImageTranslateParameterTest) {
lens::EntryPoint lens_image_translate_ep = lens::EntryPoint::
CHROME_TRANSLATE_IMAGE_WITH_GOOGLE_LENS_CONTEXT_MENU_ITEM;
std::string query_param =
- lens::GetQueryParametersForLensRequest(lens_image_translate_ep,
- /*is_full_screen_request=*/false);
+ lens::GetQueryParametersForLensRequest(lens_image_translate_ep);
EXPECT_THAT(query_param, MatchesRegex("ep=ctrcm&re=df&s=4&st=\\d+"));
}
-TEST(LensUrlUtilsTest, GetOpenNewTabSidePanelParameterTest) {
- lens::EntryPoint lens_open_new_tab_side_panel_ep =
- lens::EntryPoint::CHROME_OPEN_NEW_TAB_SIDE_PANEL;
- std::string query_param =
- lens::GetQueryParametersForLensRequest(lens_open_new_tab_side_panel_ep,
- /*is_full_screen_request=*/false);
- EXPECT_THAT(query_param, MatchesRegex("ep=cnts&re=df&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, GetFullscreenSearchQueryParameterTest) {
- lens::EntryPoint lens_ep =
- lens::EntryPoint::CHROME_FULLSCREEN_SEARCH_MENU_ITEM;
- std::string query_param =
- lens::GetQueryParametersForLensRequest(lens_ep,
- /*is_full_screen_request=*/true);
- EXPECT_THAT(query_param, MatchesRegex("ep=cfs&re=avsf&s=4&st=\\d+"));
-}
-
TEST(LensUrlUtilsTest, GetVideoFrameSearchQueryParameterTest) {
auto lens_ep = lens::EntryPoint::CHROME_VIDEO_FRAME_SEARCH_CONTEXT_MENU_ITEM;
- std::string query_param =
- lens::GetQueryParametersForLensRequest(lens_ep,
- /*is_full_screen_request=*/false);
+ std::string query_param = lens::GetQueryParametersForLensRequest(lens_ep);
EXPECT_THAT(query_param, MatchesRegex("ep=cvfs&re=df&s=4&st=\\d+"));
}
TEST(LensUrlUtilsTest, GetUnknownEntryPointTest) {
std::string query_param =
- lens::GetQueryParametersForLensRequest(lens::EntryPoint::UNKNOWN,
- /*is_full_screen_request=*/false);
+ lens::GetQueryParametersForLensRequest(lens::EntryPoint::UNKNOWN);
EXPECT_THAT(query_param, MatchesRegex("re=df&s=4&st=\\d+"));
}
-TEST(LensUrlUtilsTest, AppendRegionSearchNewTabQueryParameterTest) {
- lens::EntryPoint lens_region_search_ep =
- lens::EntryPoint::CHROME_REGION_SEARCH_MENU_ITEM;
- lens::RenderingEnvironment re =
- 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);
- EXPECT_THAT(url.query(), MatchesRegex("ep=crs&re=df&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, AppendImageSearchNewTabQueryParameterTest) {
- 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;
- GURL original_url = GURL("https://lens.google.com/");
- GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_image_search_ep, re);
- EXPECT_THAT(url.query(), MatchesRegex("ep=ccm&re=df&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, AppendImageTranslateNewTabQueryParameterTest) {
- lens::EntryPoint lens_image_translate_ep = lens::EntryPoint::
- CHROME_TRANSLATE_IMAGE_WITH_GOOGLE_LENS_CONTEXT_MENU_ITEM;
- lens::RenderingEnvironment re =
- lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
- GURL original_url = GURL("https://lens.google.com/");
- GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_image_translate_ep, re);
- EXPECT_THAT(url.query(), MatchesRegex("ep=ctrcm&re=df&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, AppendOpenNewTabSidePanelParameterTest) {
- 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;
- GURL original_url = GURL("https://lens.google.com/");
- GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_open_new_tab_side_panel_ep, re);
- EXPECT_THAT(url.query(), MatchesRegex("ep=cnts&re=df&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, AppendFullscreenSearchQueryParameterTest) {
- lens::EntryPoint lens_ep =
- lens::EntryPoint::CHROME_FULLSCREEN_SEARCH_MENU_ITEM;
- lens::RenderingEnvironment re =
- 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);
- EXPECT_THAT(url.query(), MatchesRegex("ep=cfs&re=avsf&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, AppendLensOverlayLocationBarQueryParameterTest) {
- lens::EntryPoint lens_ep = lens::EntryPoint::CHROME_LENS_OVERLAY_LOCATION_BAR;
- lens::RenderingEnvironment re =
- lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
- GURL original_url = GURL("https://lens.google.com/");
- GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(original_url,
- lens_ep, re);
- EXPECT_THAT(url.query(), MatchesRegex("ep=crmntob&re=df&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, AppendUnknownEntryPointTest) {
- lens::RenderingEnvironment re =
- lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
- GURL original_url = GURL("https://lens.google.com/");
- GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens::EntryPoint::UNKNOWN, re);
- EXPECT_THAT(url.query(), MatchesRegex("re=df&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, AppendUnknownRenderingEnvironmentTest) {
- lens::EntryPoint ep = lens::EntryPoint::CHROME_REGION_SEARCH_MENU_ITEM;
- GURL original_url = GURL("https://lens.google.com/");
- GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, ep, lens::RenderingEnvironment::RENDERING_ENV_UNKNOWN);
- EXPECT_THAT(url.query(), MatchesRegex("ep=crs&s=4&st=\\d+"));
-}
-
-TEST(LensUrlUtilsTest, AppendNonSidePanelSettingsRemovesViewportSizeTest) {
- 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;
- GURL original_url =
- GURL("https://lens.google.com/search?p=123&vph=10&vpw=10");
- GURL url = lens::AppendOrReplaceQueryParametersForLensRequest(
- original_url, lens_image_search_ep, re);
- EXPECT_THAT(url.query(), MatchesRegex("p=123&ep=ccm&re=df&s=4&st=\\d+"));
-}
-
} // namespace lens
