[Settings Refactor] Move Download settings

Move Download settings to org.chromium.chrome.browser.download package.
This package rename will be followed by modularization
(crbug.com/1047896).

Bug: 1047357
Change-Id: Iaa12fab75234a1f51f4429536ad867eedebf26c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2076440Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749411}

chrome/android/chrome_java_sources.gni

@@ -664,6 +664,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/items/OfflineContentAggregatorNotificationBridgeUiFactory.java",
   "java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/download/service/DownloadTaskScheduler.java",
+  "java/src/org/chromium/chrome/browser/download/settings/DownloadDirectoryAdapter.java",
+  "java/src/org/chromium/chrome/browser/download/settings/DownloadLocationPreference.java",
+  "java/src/org/chromium/chrome/browser/download/settings/DownloadLocationPreferenceAdapter.java",
+  "java/src/org/chromium/chrome/browser/download/settings/DownloadLocationPreferenceDialog.java",
+  "java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.java",
   "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardAdapter.java",
   "java/src/org/chromium/chrome/browser/explore_sites/CategoryCardViewHolderFactory.java",
@@ -1386,11 +1391,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/SettingsLauncher.java",
   "java/src/org/chromium/chrome/browser/settings/accessibility/AccessibilitySettings.java",
   "java/src/org/chromium/chrome/browser/settings/accessibility/TextScalePreference.java",
-  "java/src/org/chromium/chrome/browser/settings/download/DownloadDirectoryAdapter.java",
-  "java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreference.java",
-  "java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreferenceAdapter.java",
-  "java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreferenceDialog.java",
-  "java/src/org/chromium/chrome/browser/settings/download/DownloadSettings.java",
   "java/src/org/chromium/chrome/browser/settings/homepage/HomepageEditor.java",
   "java/src/org/chromium/chrome/browser/settings/homepage/HomepageMetricsEnums.java",
   "java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java",

chrome/android/java/res/xml/download_preferences.xml

@@ -4,7 +4,7 @@
      found in the LICENSE file. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <org.chromium.chrome.browser.settings.download.DownloadLocationPreference
+    <org.chromium.chrome.browser.download.settings.DownloadLocationPreference
         android:key="location_change"
         android:title="@string/downloads_location_selector_title"
         android:positiveButtonText="@string/done"

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

@@ -91,7 +91,7 @@
         android:order="16"
         android:title="@string/data_reduction_title_lite_mode"/>
     <org.chromium.chrome.browser.settings.ChromeBasePreference
-        android:fragment="org.chromium.chrome.browser.settings.download.DownloadSettings"
+        android:fragment="org.chromium.chrome.browser.download.settings.DownloadSettings"
         android:key="downloads"
         android:order="17"
         android:title="@string/menu_downloads"/>

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationCustomView.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.download;
 
-import static org.chromium.chrome.browser.settings.download.DownloadDirectoryAdapter.NO_SELECTED_ITEM_ID;
+import static org.chromium.chrome.browser.download.settings.DownloadDirectoryAdapter.NO_SELECTED_ITEM_ID;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -18,7 +18,7 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
-import org.chromium.chrome.browser.settings.download.DownloadDirectoryAdapter;
+import org.chromium.chrome.browser.download.settings.DownloadDirectoryAdapter;
 import org.chromium.chrome.download.R;
 import org.chromium.components.browser_ui.widget.text.AlertDialogEditText;
 

chrome/android/java/src/org/chromium/chrome/browser/download/home/DownloadManagerCoordinatorFactory.java

@@ -9,10 +9,10 @@ import android.content.Context;
 
 import org.chromium.chrome.browser.GlobalDiscardableReferencePool;
 import org.chromium.chrome.browser.download.items.OfflineContentAggregatorFactory;
+import org.chromium.chrome.browser.download.settings.DownloadSettings;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.download.DownloadSettings;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 

chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadDirectoryAdapter.java → chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadDirectoryAdapter.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.download;
+package org.chromium.chrome.browser.download.settings;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -233,8 +233,8 @@ public class DownloadDirectoryAdapter extends ArrayAdapter<Object> {
                     break;
                 case DirectoryOption.DownloadLocationDirectoryType.ADDITIONAL:
                     String directoryName = (numOtherAdditionalDirectories > 0)
-                            ? mContext.getString(org.chromium.chrome.R.string
-                                                         .downloads_location_sd_card_number,
+                            ? mContext.getString(
+                                    org.chromium.chrome.R.string.downloads_location_sd_card_number,
                                     numOtherAdditionalDirectories + 1)
                             : mContext.getString(
                                     org.chromium.chrome.R.string.downloads_location_sd_card);

chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreference.java → chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadLocationPreference.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.download;
+package org.chromium.chrome.browser.download.settings;
 
 import android.content.Context;
 import android.support.v7.preference.DialogPreference;

chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreferenceAdapter.java → chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadLocationPreferenceAdapter.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.download;
+package org.chromium.chrome.browser.download.settings;
 
 import android.content.Context;
 import android.view.LayoutInflater;

chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreferenceDialog.java → chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadLocationPreferenceDialog.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.download;
+package org.chromium.chrome.browser.download.settings;
 
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceDialogFragmentCompat;

chrome/android/java/src/org/chromium/chrome/browser/settings/download/DownloadSettings.java → chrome/android/java/src/org/chromium/chrome/browser/download/settings/DownloadSettings.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.download;
+package org.chromium.chrome.browser.download.settings;
 
 import android.os.Bundle;
 import android.support.v7.preference.Preference;

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadLocationChangeTest.java

@@ -29,9 +29,9 @@ import org.chromium.base.StrictModeContext;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.download.DownloadTestRule.CustomMainActivityStart;
+import org.chromium.chrome.browser.download.settings.DownloadDirectoryAdapter;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
-import org.chromium.chrome.browser.settings.download.DownloadDirectoryAdapter;
 import org.chromium.chrome.download.R;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.Features;