[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/BUILD.gn b/components/lens/BUILD.gn
index 978b24c44..b58fa7e 100644
--- a/components/lens/BUILD.gn
+++ b/components/lens/BUILD.gn
@@ -31,7 +31,6 @@
"lens_overlay_new_tab_source.h",
"lens_overlay_mime_type.h",
"lens_permission_user_action.h",
- "lens_rendering_environment.h",
"lens_testing_utils.cc",
"lens_testing_utils.h",
"lens_url_utils.cc",
diff --git a/components/lens/lens_entrypoints.h b/components/lens/lens_entrypoints.h
index 5092c7f..91e788a0 100644
--- a/components/lens/lens_entrypoints.h
+++ b/components/lens/lens_entrypoints.h
@@ -9,11 +9,9 @@
// Lens entry points for LWD.
enum EntryPoint {
- CHROME_OPEN_NEW_TAB_SIDE_PANEL,
CHROME_REGION_SEARCH_MENU_ITEM,
CHROME_SEARCH_WITH_GOOGLE_LENS_CONTEXT_MENU_ITEM,
CHROME_TRANSLATE_IMAGE_WITH_GOOGLE_LENS_CONTEXT_MENU_ITEM,
- CHROME_FULLSCREEN_SEARCH_MENU_ITEM,
CHROME_VIDEO_FRAME_SEARCH_CONTEXT_MENU_ITEM,
CHROME_LENS_OVERLAY_LOCATION_BAR,
UNKNOWN
diff --git a/components/lens/lens_features.cc b/components/lens/lens_features.cc
index c90577aa..53e4da4 100644
--- a/components/lens/lens_features.cc
+++ b/components/lens/lens_features.cc
@@ -355,24 +355,6 @@
constexpr base::FeatureParam<bool> kEnableLensHtmlRedirectFix{
&kLensStandalone, "lens-html-redirect-fix", false};
-constexpr base::FeatureParam<bool>
- kDismissLoadingStateOnDocumentOnLoadCompletedInPrimaryMainFrame{
- &kLensStandalone,
- "dismiss-loading-state-on-document-on-load-completed-in-primary-main-"
- "frame",
- false};
-
-constexpr base::FeatureParam<bool> kDismissLoadingStateOnDomContentLoaded{
- &kLensStandalone, "dismiss-loading-state-on-dom-content-loaded", false};
-
-constexpr base::FeatureParam<bool> kDismissLoadingStateOnDidFinishNavigation{
- &kLensStandalone, "dismiss-loading-state-on-did-finish-navigation", false};
-
-constexpr base::FeatureParam<bool>
- kDismissLoadingStateOnNavigationEntryCommitted{
- &kLensStandalone, "dismiss-loading-state-on-navigation-entry-committed",
- true};
-
constexpr base::FeatureParam<bool> kShouldIssuePreconnectForLens{
&kLensStandalone, "lens-issue-preconnect", true};
@@ -382,12 +364,6 @@
constexpr base::FeatureParam<bool> kShouldIssueProcessPrewarmingForLens{
&kLensStandalone, "lens-issue-process-prewarming", true};
-constexpr base::FeatureParam<bool> kDismissLoadingStateOnDidFinishLoad{
- &kLensStandalone, "dismiss-loading-state-on-did-finish-load", false};
-
-constexpr base::FeatureParam<bool> kDismissLoadingStateOnPrimaryPageChanged{
- &kLensStandalone, "dismiss-loading-state-on-primary-page-changed", false};
-
const base::FeatureParam<bool> kEnableLensFullscreenSearch{
&kLensSearchOptimizations, "enable-lens-fullscreen-search", false};
@@ -404,30 +380,6 @@
return kEnableLensHtmlRedirectFix.Get();
}
-bool GetDismissLoadingStateOnDocumentOnLoadCompletedInPrimaryMainFrame() {
- return kDismissLoadingStateOnDocumentOnLoadCompletedInPrimaryMainFrame.Get();
-}
-
-bool GetDismissLoadingStateOnDomContentLoaded() {
- return kDismissLoadingStateOnDomContentLoaded.Get();
-}
-
-bool GetDismissLoadingStateOnDidFinishNavigation() {
- return kDismissLoadingStateOnDidFinishNavigation.Get();
-}
-
-bool GetDismissLoadingStateOnNavigationEntryCommitted() {
- return kDismissLoadingStateOnNavigationEntryCommitted.Get();
-}
-
-bool GetDismissLoadingStateOnDidFinishLoad() {
- return kDismissLoadingStateOnDidFinishLoad.Get();
-}
-
-bool GetDismissLoadingStateOnPrimaryPageChanged() {
- return kDismissLoadingStateOnPrimaryPageChanged.Get();
-}
-
bool IsLensFullscreenSearchEnabled() {
return base::FeatureList::IsEnabled(kLensStandalone) &&
base::FeatureList::IsEnabled(kLensSearchOptimizations) &&
diff --git a/components/lens/lens_features.h b/components/lens/lens_features.h
index a748b5f..3d20ef6 100644
--- a/components/lens/lens_features.h
+++ b/components/lens/lens_features.h
@@ -116,40 +116,6 @@
COMPONENT_EXPORT(LENS_FEATURES)
extern bool GetEnableLensHtmlRedirectFix();
-// Returns whether to remove the Lens side panel loading state in the
-// OnDocumentOnLoadCompletedInPrimaryMainFrame web contents observer callback.
-COMPONENT_EXPORT(LENS_FEATURES)
-extern bool GetDismissLoadingStateOnDocumentOnLoadCompletedInPrimaryMainFrame();
-
-// Returns whether to remove the Lens side panel loading state in the
-// DOMContentLoaded web contents observer callback.
-COMPONENT_EXPORT(LENS_FEATURES)
-extern bool GetDismissLoadingStateOnDomContentLoaded();
-
-// Returns whether to remove the Lens side panel loading state in the
-// DidFinishNavigation web contents observer callback.
-COMPONENT_EXPORT(LENS_FEATURES)
-extern bool GetDismissLoadingStateOnDidFinishNavigation();
-
-// Returns whether to remove the Lens side panel loading state in the
-// NavigationEntryCommitted web contents observer callback.
-COMPONENT_EXPORT(LENS_FEATURES)
-extern bool GetDismissLoadingStateOnNavigationEntryCommitted();
-
-// Returns whether to remove the Lens side panel loading state in the
-// DidFinishLoad web contents observer callback.
-COMPONENT_EXPORT(LENS_FEATURES)
-extern bool GetDismissLoadingStateOnDidFinishLoad();
-
-// Returns whether to remove the Lens side panel loading state in the
-// PrimaryPageChanged web contents observer callback.
-COMPONENT_EXPORT(LENS_FEATURES)
-extern bool GetDismissLoadingStateOnPrimaryPageChanged();
-
-// Returns whether Lens fullscreen search is enabled.
-COMPONENT_EXPORT(LENS_FEATURES)
-extern bool IsLensFullscreenSearchEnabled();
-
// Returns whether the Search Image button in the Chrome Screenshot Sharing
// feature is enabled
COMPONENT_EXPORT(LENS_FEATURES)
diff --git a/components/lens/lens_rendering_environment.h b/components/lens/lens_rendering_environment.h
deleted file mode 100644
index 82969c7..0000000
--- a/components/lens/lens_rendering_environment.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2021 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COMPONENTS_LENS_LENS_RENDERING_ENVIRONMENT_H_
-#define COMPONENTS_LENS_LENS_RENDERING_ENVIRONMENT_H_
-
-namespace lens {
-
-// Lens Web rendering environments
-enum RenderingEnvironment {
- ONELENS_DESKTOP_WEB_CHROME_SIDE_PANEL,
- ONELENS_DESKTOP_WEB_FULLSCREEN,
- ONELENS_AMBIENT_VISUAL_SEARCH_WEB_FULLSCREEN,
- RENDERING_ENV_UNKNOWN,
-};
-
-} // namespace lens
-
-#endif // COMPONENTS_LENS_LENS_RENDERING_ENVIRONMENT_H_
diff --git a/components/lens/lens_url_utils.cc b/components/lens/lens_url_utils.cc
index 60fd62e7..d3a75ff 100644
--- a/components/lens/lens_url_utils.cc
+++ b/components/lens/lens_url_utils.cc
@@ -16,7 +16,6 @@
#include "components/lens/lens_features.h"
#include "components/lens/lens_metadata.h"
#include "components/lens/lens_metadata.mojom.h"
-#include "components/lens/lens_rendering_environment.h"
#include "net/base/url_util.h"
#include "url/gurl.h"
@@ -27,8 +26,6 @@
constexpr char kChromeRegionSearchMenuItem[] = "crs";
constexpr char kChromeSearchWithGoogleLensContextMenuItem[] = "ccm";
constexpr char kChromeTranslateImageWithGoogleLensContextMenuItem[] = "ctrcm";
-constexpr char kChromeOpenNewTabSidePanel[] = "cnts";
-constexpr char kChromeFullscreenSearchMenuItem[] = "cfs";
constexpr char kChromeVideoFrameSearchContextMenuItem[] = "cvfs";
constexpr char kChromeLensOverlayLocationBar[] = "crmntob";
@@ -40,11 +37,7 @@
constexpr char kLensMetadataParameter[] = "lm";
constexpr char kRenderingEnvironmentQueryParameter[] = "re";
-constexpr char kOneLensDesktopWebChromeSidePanel[] = "dcsp";
constexpr char kOneLensDesktopWebFullscreen[] = "df";
-constexpr char kOneLensAmbientVisualSearchWebFullscreen[] = "avsf";
-constexpr char kViewportWidthQueryParameter[] = "vpw";
-constexpr char kViewportHeightQueryParameter[] = "vph";
constexpr char kLensSurfaceQueryParameter[] = "lns_surface";
void AppendQueryParam(std::string* query_string,
@@ -58,16 +51,12 @@
std::string GetEntryPointQueryString(lens::EntryPoint entry_point) {
switch (entry_point) {
- case lens::CHROME_OPEN_NEW_TAB_SIDE_PANEL:
- return kChromeOpenNewTabSidePanel;
case lens::CHROME_REGION_SEARCH_MENU_ITEM:
return kChromeRegionSearchMenuItem;
case lens::CHROME_SEARCH_WITH_GOOGLE_LENS_CONTEXT_MENU_ITEM:
return kChromeSearchWithGoogleLensContextMenuItem;
case lens::CHROME_TRANSLATE_IMAGE_WITH_GOOGLE_LENS_CONTEXT_MENU_ITEM:
return kChromeTranslateImageWithGoogleLensContextMenuItem;
- case lens::CHROME_FULLSCREEN_SEARCH_MENU_ITEM:
- return kChromeFullscreenSearchMenuItem;
case lens::CHROME_VIDEO_FRAME_SEARCH_CONTEXT_MENU_ITEM:
return kChromeVideoFrameSearchContextMenuItem;
case lens::CHROME_LENS_OVERLAY_LOCATION_BAR:
@@ -78,8 +67,7 @@
}
std::map<std::string, std::string> GetLensQueryParametersMap(
- lens::EntryPoint ep,
- lens::RenderingEnvironment re) {
+ lens::EntryPoint ep) {
std::map<std::string, std::string> query_parameters;
// Insert EntryPoint query parameter.
@@ -89,23 +77,9 @@
{kEntryPointQueryParameter, entry_point_query_string});
}
- // Insert RenderingEnvironment query parameter.
- switch (re) {
- case lens::ONELENS_DESKTOP_WEB_CHROME_SIDE_PANEL:
- query_parameters.insert({kRenderingEnvironmentQueryParameter,
- kOneLensDesktopWebChromeSidePanel});
- break;
- case lens::ONELENS_DESKTOP_WEB_FULLSCREEN:
- query_parameters.insert(
- {kRenderingEnvironmentQueryParameter, kOneLensDesktopWebFullscreen});
- break;
- case lens::ONELENS_AMBIENT_VISUAL_SEARCH_WEB_FULLSCREEN:
- query_parameters.insert({kRenderingEnvironmentQueryParameter,
- kOneLensAmbientVisualSearchWebFullscreen});
- break;
- case lens::RENDERING_ENV_UNKNOWN:
- break;
- }
+ // Insert RenderingEnvironment desktop fullscreen query parameter.
+ query_parameters.insert(
+ {kRenderingEnvironmentQueryParameter, kOneLensDesktopWebFullscreen});
query_parameters.insert({kSurfaceQueryParameter, kChromiumSurfaceProtoValue});
int64_t current_time_ms = base::Time::Now().InMillisecondsSinceUnixEpoch();
@@ -114,15 +88,6 @@
return query_parameters;
}
-lens::RenderingEnvironment GetRenderingEnvironment(
- bool is_full_screen_request) {
- if (is_full_screen_request) {
- return lens::RenderingEnvironment::
- ONELENS_AMBIENT_VISUAL_SEARCH_WEB_FULLSCREEN;
- }
-
- return lens::RenderingEnvironment::ONELENS_DESKTOP_WEB_FULLSCREEN;
-}
} // namespace
namespace lens {
@@ -136,50 +101,20 @@
}
}
-GURL AppendOrReplaceQueryParametersForLensRequest(
- const GURL& url,
- lens::EntryPoint ep,
- lens::RenderingEnvironment re) {
+GURL AppendOrReplaceQueryParametersForLensRequest(const GURL& url,
+ lens::EntryPoint ep) {
GURL modified_url(url);
- for (auto const& param : GetLensQueryParametersMap(ep, re)) {
+ for (auto const& param : GetLensQueryParametersMap(ep)) {
modified_url = net::AppendOrReplaceQueryParameter(modified_url, param.first,
param.second);
}
- modified_url = net::AppendOrReplaceQueryParameter(
- modified_url, kViewportWidthQueryParameter, std::nullopt);
- modified_url = net::AppendOrReplaceQueryParameter(
- modified_url, kViewportHeightQueryParameter, std::nullopt);
-
return modified_url;
}
-GURL AppendOrReplaceViewportSizeForRequest(const GURL& url,
- const gfx::Size& viewport_size) {
- GURL modified_url(url);
-
- const int viewport_width = viewport_size.width();
- const int viewport_height = viewport_size.height();
- if (viewport_width != 0) {
- modified_url = net::AppendOrReplaceQueryParameter(
- modified_url, kViewportWidthQueryParameter,
- base::NumberToString(viewport_width));
- }
- if (viewport_height != 0) {
- modified_url = net::AppendOrReplaceQueryParameter(
- modified_url, kViewportHeightQueryParameter,
- base::NumberToString(viewport_height));
- }
- base::UmaHistogramBoolean("Search.Lens.ViewportDimensionsSent.Success",
- viewport_width != 0 && viewport_height != 0);
- return modified_url;
-}
-
-std::string GetQueryParametersForLensRequest(lens::EntryPoint ep,
- bool is_full_screen_request) {
- auto re = GetRenderingEnvironment(is_full_screen_request);
+std::string GetQueryParametersForLensRequest(lens::EntryPoint ep) {
std::string query_string;
- for (auto const& param : GetLensQueryParametersMap(ep, re)) {
+ for (auto const& param : GetLensQueryParametersMap(ep)) {
AppendQueryParam(&query_string, param.first.c_str(), param.second.c_str());
}
return query_string;
diff --git a/components/lens/lens_url_utils.h b/components/lens/lens_url_utils.h
index 9f4af22..fc5da35 100644
--- a/components/lens/lens_url_utils.h
+++ b/components/lens/lens_url_utils.h
@@ -9,7 +9,6 @@
#include "components/lens/lens_entrypoints.h"
#include "components/lens/lens_metadata.mojom.h"
-#include "components/lens/lens_rendering_environment.h"
#include "ui/gfx/geometry/size_f.h"
class GURL;
@@ -32,25 +31,14 @@
std::string* query_string,
const std::vector<lens::mojom::LatencyLogPtr>& log_data);
-// Appends the viewport width and height query params to the Lens or companion
-// request GURL if the width and height of the input size is not zero,
-// respectively.
-extern GURL AppendOrReplaceViewportSizeForRequest(
- const GURL& url,
- const gfx::Size& viewport_size);
-
// Returns a modified GURL with appended or replaced parameters depending on the
// entrypoint and other parameters.
-extern GURL AppendOrReplaceQueryParametersForLensRequest(
- const GURL& url,
- lens::EntryPoint ep,
- lens::RenderingEnvironment re);
+extern GURL AppendOrReplaceQueryParametersForLensRequest(const GURL& url,
+ lens::EntryPoint ep);
// Returns a query string with all relevant query parameters. Needed for when a
// GURL is unavailable to append to.
-extern std::string GetQueryParametersForLensRequest(
- lens::EntryPoint ep,
- bool is_full_screen_request);
+extern std::string GetQueryParametersForLensRequest(lens::EntryPoint ep);
// Check if the lens URL is a valid results page. This is done by checking if
// the URL has a payload parameter.
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
