Modify bing search params - removed chrome attrs

fix brave/brave-browser#20659

Author: simonhong

components/search_engines/BUILD.gn

@@ -1,3 +1,17 @@
 group("search_engines") {
   deps = [ "//components/search_engines" ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [ "brave_prepopulated_engines_unittest.cc" ]
+
+  deps = [
+    "//chrome/test:test_support",
+    "//components/prefs",
+    "//components/search_engines",
+    "//content/test:test_support",
+    "//testing/gtest",
+  ]
+}

components/search_engines/brave_prepopulated_engines.cc

@@ -23,7 +23,7 @@ const std::map<BravePrepopulatedEngineID, const PrepopulatedEngine*>
     brave_engines_map = {
         {PREPOPULATED_ENGINE_ID_GOOGLE, &google},
         {PREPOPULATED_ENGINE_ID_YANDEX, &brave_yandex},
-        {PREPOPULATED_ENGINE_ID_BING, &bing},
+        {PREPOPULATED_ENGINE_ID_BING, &brave_bing},
         {PREPOPULATED_ENGINE_ID_DUCKDUCKGO, &duckduckgo},
         {PREPOPULATED_ENGINE_ID_DUCKDUCKGO_DE, &duckduckgo_de},
         {PREPOPULATED_ENGINE_ID_DUCKDUCKGO_AU_NZ_IE, &duckduckgo_au_nz_ie},
@@ -38,14 +38,15 @@ PrepopulatedEngine ModifyEngineParams(const PrepopulatedEngine& engine,
                                       const wchar_t* const keyword,
                                       const char* const search_url,
                                       const char* const suggest_url,
+                                      const char* const image_url,
                                       int id) {
   return {name ? name : engine.name,
           keyword ? keyword : engine.keyword,
           engine.favicon_url,
           search_url ? search_url : engine.search_url,
           engine.encoding,
           suggest_url ? suggest_url : engine.suggest_url,
-          engine.image_url,
+          image_url ? image_url : engine.image_url,
           engine.new_tab_url,
           engine.contextual_search_url,
           engine.logo_url,
@@ -90,6 +91,7 @@ const PrepopulatedEngine duckduckgo_de =
                        NULL,
                        "https://duckduckgo.com/?q={searchTerms}&t=bravened",
                        NULL,
+                       NULL,
                        PREPOPULATED_ENGINE_ID_DUCKDUCKGO_DE);
 
 const PrepopulatedEngine duckduckgo_au_nz_ie =
@@ -98,6 +100,7 @@ const PrepopulatedEngine duckduckgo_au_nz_ie =
                        NULL,
                        "https://duckduckgo.com/?q={searchTerms}&t=braveed",
                        NULL,
+                       NULL,
                        PREPOPULATED_ENGINE_ID_DUCKDUCKGO_AU_NZ_IE);
 
 #if defined(OS_ANDROID)
@@ -136,6 +139,7 @@ const PrepopulatedEngine brave_ecosia =
 #endif
                        "&q={searchTerms}&addon=brave",
                        "https://ac.ecosia.org/?q={searchTerms}",
+                       NULL,
                        PREPOPULATED_ENGINE_ID_ECOSIA);
 
 const PrepopulatedEngine qwant = {
@@ -197,6 +201,7 @@ const PrepopulatedEngine brave_yandex =
                        "&text={searchTerms}",
                        "https://suggest.yandex.ru/suggest-ff.cgi?"
                        "part={searchTerms}&v=3&sn=5&srv=brave_desktop",
+                       NULL,
                        PREPOPULATED_ENGINE_ID_YANDEX);
 
 const PrepopulatedEngine brave_search = {
@@ -226,6 +231,15 @@ const PrepopulatedEngine brave_search = {
     PREPOPULATED_ENGINE_ID_BRAVE,
 };
 
+const PrepopulatedEngine brave_bing = ModifyEngineParams(
+    bing,
+    NULL,
+    NULL,
+    "https://www.bing.com/search?q={searchTerms}",
+    "https://www.bing.com/osjson.aspx?query={searchTerms}&language={language}",
+    "https://www.bing.com/images/detail/search?iss=sbiupload#enterInsights",
+    PREPOPULATED_ENGINE_ID_BING);
+
 const std::map<BravePrepopulatedEngineID, const PrepopulatedEngine*>&
 GetBraveEnginesMap() {
   return brave_engines_map;

components/search_engines/brave_prepopulated_engines.h

@@ -104,6 +104,7 @@ extern const PrepopulatedEngine qwant;
 extern const PrepopulatedEngine startpage;
 extern const PrepopulatedEngine brave_yandex;
 extern const PrepopulatedEngine brave_search;
+extern const PrepopulatedEngine brave_bing;
 
 const std::map<BravePrepopulatedEngineID, const PrepopulatedEngine*>&
 GetBraveEnginesMap();

components/search_engines/brave_prepopulated_engines_unittest.cc

@@ -0,0 +1,33 @@
+/* Copyright (c) 2022 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <memory>
+
+#include "brave/components/search_engines/brave_prepopulated_engines.h"
+#include "chrome/test/base/testing_profile.h"
+#include "components/prefs/pref_service.h"
+#include "components/search_engines/template_url_data.h"
+#include "components/search_engines/template_url_prepopulate_data.h"
+#include "content/public/test/browser_task_environment.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class BravePrepopulatedEnginesTest : public testing::Test {
+ public:
+  BravePrepopulatedEnginesTest() = default;
+  ~BravePrepopulatedEnginesTest() override = default;
+
+  void SetUp() override { profile_ = std::make_unique<TestingProfile>(); }
+
+  content::BrowserTaskEnvironment browser_task_environment_;
+  std::unique_ptr<TestingProfile> profile_;
+};
+
+TEST_F(BravePrepopulatedEnginesTest, ModifiedProviderTest) {
+  auto data = TemplateURLPrepopulateData::GetPrepopulatedEngine(
+      profile_->GetPrefs(),
+      TemplateURLPrepopulateData::PREPOPULATED_ENGINE_ID_BING);
+  // Check modified bing provider url.
+  EXPECT_EQ(data->url(), "https://www.bing.com/search?q={searchTerms}");
+}

test/BUILD.gn

@@ -212,6 +212,7 @@ test("brave_unit_tests") {
     "//brave/components/ntp_widget_utils/browser",
     "//brave/components/p3a",
     "//brave/components/permissions:unit_tests",
+    "//brave/components/search_engines:unit_tests",
     "//brave/components/services/ipfs/test:ipfs_service_unit_tests",
     "//brave/components/sidebar:unit_tests",
     "//brave/components/signin/public/identity_manager:unit_tests",