commit f591619833631921fa92314c13876aa3f076029e
author Juan Mojica <juanmojica@google.com> Wed Dec 15 00:53:59 2021
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Dec 15 00:53:59 2021
tree 2eca171ea5b851805cb378b66798bcf637dc0c94
parent b73e172d9c60096c6cb6f2e239c2cfcd388d34d2

Reland "Launch Lens image search on desktop at ToT."

This fixes the broken unit test by enabling the feature param directly in the test.
This does not fix any aforementioned latency issues.

This is a reland of b6f385ec3db1423580cabd0f5a2e4281c341cd44

Original change's description:
> Launch Lens image search on desktop at ToT.
>
> Also disables the image search URL change if on a non-desktop platform.
>
> Bug: 1168677, 1222313
> Change-Id: I855e3838e344ba260b8829a2f8cc355f2c31e2da
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3328902
> Reviewed-by: Ben Goldberger <benwgold@google.com>
> Reviewed-by: Orin Jaworski <orinj@chromium.org>
> Commit-Queue: Juan Mojica <juanmojica@google.com>
> Cr-Commit-Position: refs/heads/main@{#951102}

Bug: 1168677, 1222313
Change-Id: I5af7d720dbff2f9ee13422758fa094a03a40b896
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3338437
Reviewed-by: Orin Jaworski <orinj@chromium.org>
Reviewed-by: Ben Goldberger <benwgold@google.com>
Commit-Queue: Juan Mojica <juanmojica@google.com>
Cr-Commit-Position: refs/heads/main@{#951753}

chrome/browser/ui/views/lens/lens_side_panel_controller_unittest.cc

diff --git a/chrome/browser/ui/views/lens/lens_side_panel_controller_unittest.cc b/chrome/browser/ui/views/lens/lens_side_panel_controller_unittest.cc
index 1a82b6b..d46e5f8 100644
--- a/chrome/browser/ui/views/lens/lens_side_panel_controller_unittest.cc
+++ b/chrome/browser/ui/views/lens/lens_side_panel_controller_unittest.cc
@@ -29,9 +29,11 @@
  public:
   void SetUp() override {
     base::test::ScopedFeatureList features;
-    features.InitWithFeatures(
-        {features::kLensRegionSearch, ::features::kSidePanel,
-         reading_list::switches::kReadLater},
+    features.InitWithFeaturesAndParameters(
+        {{features::kLensRegionSearch,
+          {{"region-search-enable-side-panel", "true"}}},
+         {::features::kSidePanel, {}},
+         {reading_list::switches::kReadLater, {}}},
         {});
     TestWithBrowserView::SetUp();
     // Create the lens side panel controller in BrowserView.

components/lens/lens_features.cc

diff --git a/components/lens/lens_features.cc b/components/lens/lens_features.cc
index 485403ba..82b1d47d 100644
--- a/components/lens/lens_features.cc
+++ b/components/lens/lens_features.cc
@@ -11,10 +11,10 @@
 namespace features {
 
 const base::Feature kLensStandalone{"LensStandalone",
-                                    base::FEATURE_DISABLED_BY_DEFAULT};
+                                    base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kLensRegionSearch{"LensRegionSearch",
-                                      base::FEATURE_DISABLED_BY_DEFAULT};
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::FeatureParam<bool> kRegionSearchMacCursorFix{
     &kLensRegionSearch, "region-search-mac-cursor-fix", true};
@@ -32,13 +32,13 @@
     &kLensRegionSearch, "use-menu-item-alt-text-4", true};
 
 const base::FeatureParam<bool> kEnableUKMLoggingForRegionSearch{
-    &kLensRegionSearch, "region-search-enable-ukm-logging", false};
+    &kLensRegionSearch, "region-search-enable-ukm-logging", true};
 
 const base::FeatureParam<bool> kEnableUKMLoggingForImageSearch{
-    &kLensStandalone, "enable-ukm-logging", false};
+    &kLensStandalone, "enable-ukm-logging", true};
 
 const base::FeatureParam<bool> kEnableSidePanelForLensRegionSearch{
-    &kLensRegionSearch, "region-search-enable-side-panel", true};
+    &kLensRegionSearch, "region-search-enable-side-panel", false};
 
 const base::FeatureParam<bool> kEnableSidePanelForLensImageSearch{
     &kLensStandalone, "enable-side-panel", false};

components/search_engines/search_terms_data.cc

diff --git a/components/search_engines/search_terms_data.cc b/components/search_engines/search_terms_data.cc
index 52eca74..cd86498 100644
--- a/components/search_engines/search_terms_data.cc
+++ b/components/search_engines/search_terms_data.cc
@@ -5,6 +5,7 @@
 #include "components/search_engines/search_terms_data.h"
 
 #include "base/check.h"
+#include "build/build_config.h"
 #include "components/google/core/common/google_util.h"
 #include "components/lens/lens_features.h"
 #include "url/gurl.h"
@@ -20,6 +21,7 @@
 std::string SearchTermsData::GoogleBaseSearchByImageURLValue() const {
   const std::string kGoogleHomepageURLPath = std::string("searchbyimage/");
 
+#if !defined(OS_IOS) && !defined(OS_ANDROID)
   // If both LensStandalone and LensRegionSearch features are enabled,
   // LensStandalone parameters will take precedence even if the values differ.
   if (base::FeatureList::IsEnabled(lens::features::kLensStandalone)) {
@@ -27,6 +29,8 @@
   } else if (base::FeatureList::IsEnabled(lens::features::kLensRegionSearch)) {
     return lens::features::GetHomepageURLForRegionSearch();
   }
+#endif  // !defined(OS_IOS) && !defined(OS_ANDROID)
+
   return google_util::kGoogleHomepageURL + kGoogleHomepageURLPath;
 }