[Settings Refactor] Move datareduction settings

Move datareduction settings alongside other datareduction code.

Bug: 1047357
Change-Id: I2946c09be6dc5b7d3b390eac70fffe49af534cf4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2031543Reviewed-by: Megan Jablonski <megjablon@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738321}

chrome/android/chrome_java_sources.gni

@@ -467,6 +467,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/datareduction/DataReductionPromoUtils.java",
   "java/src/org/chromium/chrome/browser/datareduction/DataReductionProxyUma.java",
   "java/src/org/chromium/chrome/browser/datareduction/DataReductionSavingsMilestonePromo.java",
+  "java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionDataUseItem.java",
+  "java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.java",
+  "java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionSiteBreakdownView.java",
+  "java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionStatsPreference.java",
   "java/src/org/chromium/chrome/browser/dependency_injection/ActivityScope.java",
   "java/src/org/chromium/chrome/browser/dependency_injection/ChromeActivityCommonsModule.java",
   "java/src/org/chromium/chrome/browser/dependency_injection/ChromeActivityComponent.java",
@@ -1388,10 +1392,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerCardEditor.java",
   "java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerProfileFragment.java",
   "java/src/org/chromium/chrome/browser/settings/autofill/CreditCardNumberFormattingTextWatcher.java",
-  "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionDataUseItem.java",
-  "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java",
-  "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionSiteBreakdownView.java",
-  "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionStatsPreference.java",
   "java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java",
   "java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java",
   "java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java",

chrome/android/chrome_test_java_sources.gni

@@ -122,6 +122,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/customtabs/dynamicmodule/CustomTabsDynamicModuleUITest.java",
   "javatests/src/org/chromium/chrome/browser/datareduction/DataReductionPromoUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/datareduction/DataReductionSavingsMilestonePromoTest.java",
+  "javatests/src/org/chromium/chrome/browser/datareduction/settings/DataReductionStatsPreferenceTest.java",
   "javatests/src/org/chromium/chrome/browser/dependency_injection/ModuleOverridesRule.java",
   "javatests/src/org/chromium/chrome/browser/device_dialog/BluetoothChooserDialogTest.java",
   "javatests/src/org/chromium/chrome/browser/device_dialog/BluetoothScanningPermissionDialogTest.java",
@@ -411,7 +412,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/settings/accessibility/AccessibilitySettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillTestRule.java",
-  "javatests/src/org/chromium/chrome/browser/settings/datareduction/DataReductionStatsPreferenceTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/developer/TracingSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/notifications/NotificationsSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/password/PasswordSettingsTest.java",

chrome/android/java/res/layout/data_usage_breakdown.xml

@@ -3,7 +3,7 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
-<org.chromium.chrome.browser.settings.datareduction.DataReductionSiteBreakdownView
+<org.chromium.chrome.browser.datareduction.settings.DataReductionSiteBreakdownView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/breakdown"
     android:layout_height="wrap_content"
@@ -72,4 +72,4 @@
 
     </TableLayout>
 
-</org.chromium.chrome.browser.settings.datareduction.DataReductionSiteBreakdownView>
+</org.chromium.chrome.browser.datareduction.settings.DataReductionSiteBreakdownView>

chrome/android/java/res/xml/data_reduction_preferences.xml

@@ -6,7 +6,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <org.chromium.chrome.browser.settings.datareduction.DataReductionStatsPreference
+    <org.chromium.chrome.browser.datareduction.settings.DataReductionStatsPreference
         android:key="data_reduction_stats"
         android:layout="@layout/custom_preference"
         android:selectable="false"

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

@@ -86,7 +86,7 @@
         android:order="15"
         android:title="@string/language_settings"/>
     <org.chromium.chrome.browser.settings.ChromeBasePreference
-        android:fragment="org.chromium.chrome.browser.settings.datareduction.DataReductionPreferenceFragment"
+        android:fragment="org.chromium.chrome.browser.datareduction.settings.DataReductionPreferenceFragment"
         android:key="data_reduction"
         android:order="16"
         android:title="@string/data_reduction_title_lite_mode"/>

chrome/android/java/src/PRESUBMIT.py

@@ -79,6 +79,7 @@ def _CheckAlertDialogBuilder(input_api, output_api):
   # general, preference and FRE related UIs are not relevant to VR mode.
   blacklist = (
       BROWSER_ROOT + 'browserservices/ClearDataDialogActivity.java',
+      BROWSER_ROOT + 'datareduction/settings/DataReductionStatsPreference.java',
       BROWSER_ROOT + 'password_manager/AccountChooserDialog.java',
       BROWSER_ROOT + 'password_manager/AutoSigninFirstRunDialog.java',
       BROWSER_ROOT + r'settings[\\\/].*',

chrome/android/java/src/org/chromium/chrome/browser/datareduction/DataReductionMainMenuItem.java

@@ -16,11 +16,11 @@ import android.widget.TextView;
 
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.datareduction.settings.DataReductionPreferenceFragment;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.datareduction.DataReductionPreferenceFragment;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.third_party.android.datausagechart.ChartDataUsageView;

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

chrome/android/java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java → chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionPreferenceFragment.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.datareduction;
+package org.chromium.chrome.browser.datareduction.settings;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;

chrome/android/java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionSiteBreakdownView.java → chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionSiteBreakdownView.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.datareduction;
+package org.chromium.chrome.browser.datareduction.settings;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

chrome/android/java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionStatsPreference.java → chrome/android/java/src/org/chromium/chrome/browser/datareduction/settings/DataReductionStatsPreference.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.datareduction;
+package org.chromium.chrome.browser.datareduction.settings;
 
 import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
 import static android.text.format.DateUtils.FORMAT_NO_YEAR;
@@ -37,6 +37,7 @@ import org.chromium.chrome.browser.datareduction.DataReductionProxyUma;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+import org.chromium.chrome.browser.settings.datareduction.DataReductionProxySavingsClearedReason;
 import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.util.FileSizeUtil;
 import org.chromium.third_party.android.datausagechart.ChartDataUsageView;
@@ -227,12 +228,12 @@ public class DataReductionStatsPreference extends Preference {
         mStartDateTextView.setText(mShouldShowRealData ? mStartDatePhrase : "");
         mStartDateTextView.setContentDescription(mShouldShowRealData
                         ? context.getString(R.string.data_reduction_start_date_content_description,
-                                  mStartDatePhrase)
+                                mStartDatePhrase)
                         : "");
         mEndDateTextView.setText(mShouldShowRealData ? mEndDatePhrase : "");
         mEndDateTextView.setContentDescription(mShouldShowRealData
                         ? context.getString(R.string.data_reduction_end_date_content_description,
-                                  mEndDatePhrase)
+                                mEndDatePhrase)
                         : "");
         if (mDataUsageTextView != null) {
             mDataUsageTextView.setText(mShouldShowRealData ? mReceivedTotalPhrase : "");

chrome/android/java/src/org/chromium/chrome/browser/infobar/PreviewsLitePageInfoBar.java

@@ -9,8 +9,8 @@ import android.os.Bundle;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ResourceId;
+import org.chromium.chrome.browser.datareduction.settings.DataReductionPreferenceFragment;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.datareduction.DataReductionPreferenceFragment;
 
 /**
  * An InfoBar that lets the user know that Data Saver Lite Mode now also applies to HTTPS pages.

chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java

@@ -13,11 +13,11 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.browser.datareduction.DataReductionPromoUtils;
+import org.chromium.chrome.browser.datareduction.settings.DataReductionDataUseItem;
+import org.chromium.chrome.browser.datareduction.settings.DataReductionStatsPreference;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
-import org.chromium.chrome.browser.settings.datareduction.DataReductionDataUseItem;
 import org.chromium.chrome.browser.settings.datareduction.DataReductionProxySavingsClearedReason;
-import org.chromium.chrome.browser.settings.datareduction.DataReductionStatsPreference;
 import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.util.UrlConstants;
 

chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

@@ -17,6 +17,7 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.datareduction.settings.DataReductionPreferenceFragment;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.FeatureUtilities;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
@@ -26,7 +27,6 @@ import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
 import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
-import org.chromium.chrome.browser.settings.datareduction.DataReductionPreferenceFragment;
 import org.chromium.chrome.browser.settings.developer.DeveloperSettings;
 import org.chromium.chrome.browser.settings.sync.SignInPreference;
 import org.chromium.chrome.browser.settings.sync.SyncSettingsUtils;

chrome/android/java/src/org/chromium/chrome/browser/settings/datareduction/OWNERS

-# Data Saver settings:
-file://components/data_reduction_proxy/OWNERS
-
-# COMPONENT: UI>Browser>Mobile>Settings>DataSaver

chrome/android/javatests/src/org/chromium/chrome/browser/settings/datareduction/DataReductionStatsPreferenceTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/datareduction/settings/DataReductionStatsPreferenceTest.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.datareduction;
+package org.chromium.chrome.browser.datareduction.settings;
 
 import static org.chromium.third_party.android.datausagechart.ChartDataUsageView.MAXIMUM_DAYS_IN_CHART;
 import static org.chromium.third_party.android.datausagechart.ChartDataUsageView.MINIMUM_DAYS_IN_CHART;