[Settings Refactor][TTS] Move Contextual Search settings

Move Contextual Search settings alongside Contextual Search code.

Bug: 1047357
Change-Id: I0b8bd5e9f666df98efd4ac0b77e6ee118ec35fff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2086073
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Donn Denman <donnd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747488}

chrome/android/chrome_java_sources.gni

@@ -360,6 +360,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchNetworkCommunicator.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchObserver.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java",
+  "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRequest.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.java",
@@ -1419,7 +1420,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/password/SingleThreadBarrierClosure.java",
   "java/src/org/chromium/chrome/browser/settings/password/TimedCallbackDelayer.java",
   "java/src/org/chromium/chrome/browser/settings/privacy/BandwidthType.java",
-  "java/src/org/chromium/chrome/browser/settings/privacy/ContextualSearchPreferenceFragment.java",
   "java/src/org/chromium/chrome/browser/settings/privacy/DoNotTrackSettings.java",
   "java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferencesManager.java",
   "java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java",

chrome/android/java/res/xml/sync_and_services_preferences.xml

@@ -87,6 +87,6 @@
         <org.chromium.chrome.browser.settings.ChromeBasePreference
             android:key="contextual_search"
             android:title="@string/contextual_search_title"
-            android:fragment="org.chromium.chrome.browser.settings.privacy.ContextualSearchPreferenceFragment"/>
+            android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"/>
     </PreferenceCategory>
 </PreferenceScreen>

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPromoControl.java

@@ -22,8 +22,8 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelAnimation;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelInflater;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
+import org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.privacy.ContextualSearchPreferenceFragment;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
 import org.chromium.ui.text.NoUnderlineClickableSpan;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ContextualSearchPreferenceFragment.java → chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPreferenceFragment.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.privacy;
+package org.chromium.chrome.browser.contextualsearch;
 
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceFragmentCompat;
@@ -10,8 +10,6 @@ import android.support.v7.preference.PreferenceFragmentCompat;
 import androidx.annotation.XmlRes;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchUma;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 import org.chromium.chrome.browser.settings.SettingsUtils;