Update DDG Se (#9458)

* Update DDG Se

* Fix broken Android tests

Co-authored-by: Brian Clifton <brian@clifton.me>

android/brave_java_resources.gni

@@ -731,7 +731,6 @@ brave_java_resources = [
   "java/res/layout/brave_bookmark_toolbar.xml",
   "java/res/layout/brave_bottom_new_tab_button.xml",
   "java/res/layout/brave_custom_tabs_toolbar.xml",
-  "java/res/layout/brave_ddg_offer_link.xml",
   "java/res/layout/brave_dialog_preference.xml",
   "java/res/layout/brave_rewards_auto_contrib.xml",
   "java/res/layout/brave_rewards_donation_sent.xml",
@@ -770,7 +769,6 @@ brave_java_resources = [
   "java/res/layout/brave_webrtc_policy_preference.xml",
   "java/res/layout/bre_bottom_banner.xml",
   "java/res/layout/crypto_widget_layout.xml",
-  "java/res/layout/ddg_offer_layout.xml",
   "java/res/layout/fragment_add_account_onboarding_dialog.xml",
   "java/res/layout/fragment_backup_wallet.xml",
   "java/res/layout/fragment_binance_buy.xml",

android/brave_java_sources.gni

@@ -90,7 +90,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotification.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationPublisher.java",
   "../../brave/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationUtil.java",
-  "../../brave/android/java/org/chromium/chrome/browser/ntp/BraveDuckDuckGoOfferView.java",
   "../../brave/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java",
   "../../brave/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java",
   "../../brave/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java",

android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java

@@ -935,9 +935,7 @@ public void onUrlFocusChange(boolean hasFocus) {
                 && BraveActivity.getBraveActivity().getActivityTab() != null
                 && UrlUtilities.isNTPUrl(
                         BraveActivity.getBraveActivity().getActivityTab().getUrlString())
-                && !OnboardingPrefManager.getInstance().hasSearchEngineOnboardingShown()
-                && !BraveSearchEngineUtils.getDSEShortName(true).equals(
-                        OnboardingPrefManager.DUCKDUCKGO)) {
+                && !OnboardingPrefManager.getInstance().hasSearchEngineOnboardingShown()) {
             Intent searchActivityIntent = new Intent(context, SearchActivity.class);
             context.startActivity(searchActivityIntent);
         }

android/java/res/layout/new_tab_page_incognito.xml

@@ -86,12 +86,6 @@
                 android:text="@string/learn_more"
                 android:visibility = "gone" />
 
-            <org.chromium.chrome.browser.ntp.BraveDuckDuckGoOfferView android:id="@+id/brave_duck_duck_go_offer_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-                    <include layout="@layout/brave_ddg_offer_link" />
-            </org.chromium.chrome.browser.ntp.BraveDuckDuckGoOfferView>
-
         </LinearLayout>
 
     </org.chromium.chrome.browser.ntp.NewTabPageScrollView>

browser/ui/android/strings/android_brave_strings.grd

@@ -406,21 +406,6 @@ This file contains all "about" strings.  It is set to NOT be translated, in tran
       <message name="IDS_MENU_BRAVE_REWARDS" desc="Title for brave rewards menu item">
         Brave Rewards
       </message>
-      <message name="IDS_DDG_OFFER_TITLE" desc="Title for DDG offer.">
-        Private search with DuckDuckGo?
-      </message>
-      <message name="IDS_DDG_OFFER_TEXT" desc="Text for DDG offer.">
-        With private search, Brave will use DuckDuckGo to answer your searches while you are in this private tab. DuckDuckGo is a search engine that does not track your search history, enabling you to search privately.
-      </message>
-      <message name="IDS_DDG_OFFER_POSITIVE" desc="Positive button text for DDG offer.">
-        Yes
-      </message>
-      <message name="IDS_DDG_OFFER_NEGATIVE" desc="Negative button text for DDG offer.">
-        No
-      </message>
-      <message name="IDS_DDG_OFFER_LINK" desc="Text for DDG offer link.">
-        Learn about private search with DuckDuckGo
-      </message>
       <message name="IDS_BRAVE_UI_THANK_YOU" desc="A message that appears after tipping">
         Thank you
       </message>

chromium_src/components/search_engines/template_url_prepopulate_data.cc

@@ -363,7 +363,7 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
   if (!t_urls.empty())
     return t_urls;
 
-  int version = kBraveFirstTrackedDataVersion;
+  int version = kBraveCurrentDataVersion;
   if (prefs && prefs->HasPrefPath(kBraveDefaultSearchVersion)) {
     version = prefs->GetInteger(kBraveDefaultSearchVersion);
   }

test/BUILD.gn

@@ -1072,7 +1072,6 @@ if (is_android) {
     }
 
     sources = [
-      "//brave/android/javatests/org/chromium/chrome/browser/BravePrivateTabTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/BytecodeTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/password_manager/settings/BravePasswordSettingsTest.java",
       "//brave/android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java",