[Settings Refactor] Move Search Engine settings

Move Search Engine settings alongside Search Engine code.

Bug: 1047357
Change-Id: I97f1d8ccd4937d59aaff851db4f911b5426024e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2039600Reviewed-by: Filip Gorski <fgorski@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738717}

chrome/android/chrome_java_sources.gni

@@ -1345,6 +1345,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceMetrics.java",
   "java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotification.java",
   "java/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceFactory.java",
+  "java/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter.java",
+  "java/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineSettings.java",
   "java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java",
   "java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java",
   "java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java",
@@ -1449,8 +1451,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/privacy/OtherFormsOfHistoryDialogFragment.java",
   "java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferencesManager.java",
   "java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java",
-  "java/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineAdapter.java",
-  "java/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineSettings.java",
   "java/src/org/chromium/chrome/browser/settings/sync/AccountManagementFragment.java",
   "java/src/org/chromium/chrome/browser/settings/sync/ManageSyncSettings.java",
   "java/src/org/chromium/chrome/browser/settings/sync/SignInPreference.java",

chrome/android/chrome_junit_test_java_sources.gni

@@ -171,6 +171,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/preferences/PrefServiceBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceMetricsTest.java",
   "junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java",
+  "junit/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapterTest.java",
   "junit/src/org/chromium/chrome/browser/send_tab_to_self/NotificationSharedPrefManagerTest.java",
   "junit/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfAndroidBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivityTest.java",
@@ -183,7 +184,6 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/settings/password/SingleThreadBarrierClosureTest.java",
   "junit/src/org/chromium/chrome/browser/settings/password/TimedCallbackDelayerTest.java",
   "junit/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferencesManagerTest.java",
-  "junit/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineAdapterTest.java",
   "junit/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallMessageHandlerTest.java",
   "junit/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialogTest.java",
   "junit/src/org/chromium/chrome/browser/signin/ConfirmManagedSyncDataDialogTest.java",

chrome/android/chrome_test_java_sources.gni

@@ -405,6 +405,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/provider/ProviderTestRule.java",
   "javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java",
   "javatests/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceTest.java",
+  "javatests/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/searchwidget/SearchActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProviderTest.java",
   "javatests/src/org/chromium/chrome/browser/services/GoogleServicesManagerIntegrationTest.java",
@@ -422,7 +423,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragmentBasicTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferencesManagerNativeTest.java",
-  "javatests/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/website/CookieControlsBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/website/ManageSpaceActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/website/PermissionInfoTest.java",

chrome/android/java/res/xml/main_preferences.xml

@@ -26,7 +26,7 @@
         android:order="3"
         android:title="@string/prefs_section_basics"/>
     <org.chromium.chrome.browser.settings.ChromeBasePreference
-        android:fragment="org.chromium.chrome.browser.settings.search_engine.SearchEngineSettings"
+        android:fragment="org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings"
         android:key="search_engine"
         android:order="4"
         android:title="@string/search_engine_settings"/>

chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java

@@ -27,8 +27,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
+import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.search_engine.SearchEngineSettings;
 import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;

chrome/android/java/src/org/chromium/chrome/browser/locale/SogouPromoDialog.java

@@ -22,8 +22,8 @@ import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.search_engine.SearchEngineSettings;
 import org.chromium.components.browser_ui.widget.PromoDialog;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.text.SpanApplier;

chrome/android/java/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotification.java

@@ -14,8 +14,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.omaha.VersionNumber;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.search_engine.SearchEngineSettings;
 import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;

chrome/android/java/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineAdapter.java → chrome/android/java/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.settings.search_engine;
+package org.chromium.chrome.browser.search_engines.settings;
 
 import android.content.Context;
 import android.content.res.Resources;

chrome/android/java/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineSettings.java → chrome/android/java/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineSettings.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.settings.search_engine;
+package org.chromium.chrome.browser.search_engines.settings;
 
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;

chrome/android/javatests/src/org/chromium/chrome/browser/search_engines/TemplateUrlServiceTest.java

@@ -16,7 +16,7 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.RetryOnFailure;
-import org.chromium.chrome.browser.settings.search_engine.SearchEngineAdapter;
+import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 import org.chromium.components.search_engines.TemplateUrl;
 import org.chromium.components.search_engines.TemplateUrlService;

chrome/android/javatests/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineSettingsTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineSettingsTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.settings.search_engine;
+package org.chromium.chrome.browser.search_engines.settings;
 
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;

chrome/android/junit/src/org/chromium/chrome/browser/settings/search_engine/SearchEngineAdapterTest.java → chrome/android/junit/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapterTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.settings.search_engine;
+package org.chromium.chrome.browser.search_engines.settings;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;

chrome/test/android/javatests/src/org/chromium/chrome/test/pagecontroller/codelabsolution/README.md

@@ -150,7 +150,7 @@ import java.util.List;
 
 /**
  * Search Engine Selection Page Controller for the Code Lab, corresponds to
- * {@link org.chromium.chrome.browser.settings.search_engine.SearchEngineSettings}.
+ * {@link org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings}.
  */
 public class SearchEngineSelectionControllerForCodelab extends PageController {
     // TODO: Put locators here.

chrome/test/android/javatests/src/org/chromium/chrome/test/pagecontroller/controllers/codelab/SearchEngineSelectionControllerForCodelab.java

@@ -12,7 +12,7 @@ import org.chromium.chrome.test.pagecontroller.controllers.PageController;
  * Search Engine Selection Page Controller for the Code Lab, representing
  * SearchEnginePreferences.java.
  *
- * @see org.chromium.chrome.browser.settings.search_engine.SearchEngineSettings
+ * @see {@link org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings}
  */
 
 public class SearchEngineSelectionControllerForCodelab extends PageController {