[Settings Refactor] Move Browsing Data settings

Move Clear Browsing Data settings alongside other Browsing Data code,
and update associated OWNERS files.

Bug: 1047357
Change-Id: Idcb8a642beb9ca221b9ad0a56aa523c0b02b580f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2075049
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747027}

chrome/android/BUILD.gn

@@ -2602,6 +2602,8 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java",
     "java/src/org/chromium/chrome/browser/browserservices/OriginVerifier.java",
     "java/src/org/chromium/chrome/browser/browserservices/permissiondelegation/InstalledWebappBridge.java",
+    "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java",
+    "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataCounterBridge.java",
     "java/src/org/chromium/chrome/browser/browsing_data/UrlFilterBridge.java",
     "java/src/org/chromium/chrome/browser/childaccounts/ChildAccountFeedbackReporter.java",
     "java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java",
@@ -2803,8 +2805,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/settings/about/AboutSettingsBridge.java",
     "java/src/org/chromium/chrome/browser/settings/password/PasswordEditingBridge.java",
     "java/src/org/chromium/chrome/browser/settings/password/PasswordUIView.java",
-    "java/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataBridge.java",
-    "java/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataCounterBridge.java",
     "java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferencesManager.java",
     "java/src/org/chromium/chrome/browser/settings/website/CookieControlsBridge.java",
     "java/src/org/chromium/chrome/browser/settings/website/CookieControlsServiceBridge.java",

chrome/android/chrome_java_sources.gni

@@ -192,6 +192,16 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashImageHolder.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/TwaSplashController.java",
   "java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/TrustedWebActivityDisclosureView.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataCounterBridge.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAdvanced.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/ConfirmImportantSitesDialogFragment.java",
+  "java/src/org/chromium/chrome/browser/browsing_data/OtherFormsOfHistoryDialogFragment.java",
   "java/src/org/chromium/chrome/browser/browsing_data/UrlFilter.java",
   "java/src/org/chromium/chrome/browser/browsing_data/UrlFilterBridge.java",
   "java/src/org/chromium/chrome/browser/browsing_data/UrlFilters.java",
@@ -1412,18 +1422,8 @@ 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/BrowsingDataBridge.java",
-  "java/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataCounterBridge.java",
-  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataCheckBoxPreference.java",
-  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFetcher.java",
-  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragment.java",
-  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragmentAdvanced.java",
-  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragmentBasic.java",
-  "java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataTabsFragment.java",
-  "java/src/org/chromium/chrome/browser/settings/privacy/ConfirmImportantSitesDialogFragment.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/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/website/AddExceptionPreference.java",

chrome/android/chrome_test_java_sources.gni

@@ -74,7 +74,11 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityTestUtil.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPermissionsTest.java",
   "javatests/src/org/chromium/chrome/browser/browserservices/permissiondelegation/TrustedWebActivityPreferencesUiTest.java",
+  "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java",
+  "javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataTest.java",
+  "javatests/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasicTest.java",
+  "javatests/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/compositor/CompositorVisibilityTest.java",
   "javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelBaseTest.java",
   "javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java",
@@ -414,10 +418,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/settings/homepage/HomepageSettingsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/homepage/HomepageSettingsFragmentWithEditorTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/password/PasswordSettingsTest.java",
-  "javatests/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataBridgeTest.java",
-  "javatests/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataTest.java",
-  "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/website/CookieControlsBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/website/CookieControlsServiceBridgeTest.java",

chrome/android/java/res/xml/clear_browsing_data_preferences_tab.xml

@@ -13,34 +13,34 @@
         android:title="@string/clear_browsing_data_tab_period_title"
         app:singleLine="true" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_history_checkbox"
         android:persistent="false"
         android:title="@string/clear_history_title"
         android:summary="@string/clear_browsing_history_summary" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_cookies_checkbox"
         android:persistent="false"
         android:title="@string/clear_cookies_and_site_data_title"
         android:summary="@string/clear_cookies_and_site_data_summary_basic" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_cache_checkbox"
         android:persistent="false"
         android:title="@string/clear_cache_title" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_passwords_checkbox"
         android:persistent="false"
         android:title="@string/clear_passwords_title" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_form_data_checkbox"
         android:persistent="false"
         android:title="@string/clear_form_data_title" />
 
-    <org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataCheckBoxPreference
+    <org.chromium.chrome.browser.browsing_data.ClearBrowsingDataCheckBoxPreference
         android:key="clear_site_settings_checkbox"
         android:persistent="false"
         android:title="@string/prefs_site_settings" />

chrome/android/java/res/xml/privacy_preferences.xml

@@ -27,7 +27,7 @@
         android:key="clear_browsing_data"
         android:title="@string/clear_browsing_data_title"
         android:summary="@string/clear_browsing_data_summary"
-        android:fragment="org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataTabsFragment" />
+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment" />
     <org.chromium.chrome.browser.settings.TextMessagePreference
         android:key="sync_and_services_link"
         android:summary="@string/privacy_sync_and_services_link"

chrome/android/java/src/PRESUBMIT.py

@@ -79,6 +79,8 @@ 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 + 'browsing_data/ConfirmImportantSitesDialogFragment.java',
+      BROWSER_ROOT + 'browsing_data/OtherFormsOfHistoryDialogFragment.java',
       BROWSER_ROOT + 'datareduction/settings/DataReductionStatsPreference.java',
       BROWSER_ROOT + 'password_manager/AccountChooserDialog.java',
       BROWSER_ROOT + 'password_manager/AutoSigninFirstRunDialog.java',

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java

@@ -21,6 +21,7 @@ import org.chromium.base.LocaleUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.accessibility.FontSizePrefs;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataBridge;
 import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
 import org.chromium.chrome.browser.browsing_data.TimePeriod;
 import org.chromium.chrome.browser.metrics.UmaUtils;
@@ -33,7 +34,6 @@ import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataBridge;
 import org.chromium.chrome.browser.share.ShareImageFileUtils;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.translate.TranslateBridge;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataBridge.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java

@@ -2,15 +2,13 @@
 // 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.browsing_data;
 
 import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
-import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
-import org.chromium.chrome.browser.browsing_data.TimePeriod;
 import org.chromium.chrome.browser.profiles.Profile;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataCounterBridge.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataCounterBridge.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.browsing_data;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataCheckBoxPreference.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.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.browsing_data;
 
 import android.content.Context;
 import android.support.v4.view.ViewCompat;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFetcher.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.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.browsing_data;
 
 import android.os.Parcel;
 import android.os.Parcelable;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragment.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.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.browsing_data;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -27,10 +27,7 @@ import androidx.collection.ArraySet;
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
-import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTab;
-import org.chromium.chrome.browser.browsing_data.CookieOrCacheDeletionChoice;
-import org.chromium.chrome.browser.browsing_data.TimePeriod;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataCounterBridge.BrowsingDataCounterCallback;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.historyreport.AppIndexingReporter;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
@@ -38,7 +35,6 @@ import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.SpinnerPreference;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataCounterBridge.BrowsingDataCounterCallback;
 import org.chromium.ui.widget.ButtonCompat;
 
 import java.lang.annotation.Retention;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragmentAdvanced.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAdvanced.java

@@ -2,11 +2,10 @@
 // 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.browsing_data;
 
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
-import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTab;
 
 import java.util.Arrays;
 import java.util.List;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragmentBasic.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java

@@ -2,14 +2,13 @@
 // 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.browsing_data;
 
 import android.os.Bundle;
 
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTab;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.tab.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataTabsFragment.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.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.browsing_data;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -25,7 +25,6 @@ import android.view.ViewGroup;
 
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTab;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.SettingsActivity;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/ConfirmImportantSitesDialogFragment.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ConfirmImportantSitesDialogFragment.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.browsing_data;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -53,8 +53,8 @@ import java.util.Set;
  * method) and onActivityResult return conventions.
  */
 public class ConfirmImportantSitesDialogFragment extends DialogFragment {
-    private class ClearBrowsingDataAdapter extends ArrayAdapter<String>
-            implements AdapterView.OnItemClickListener {
+    private class ClearBrowsingDataAdapter
+            extends ArrayAdapter<String> implements AdapterView.OnItemClickListener {
         private final String[] mDomains;
         private final int mFaviconSize;
         private RoundedIconGenerator mIconGenerator;

chrome/android/java/src/org/chromium/chrome/browser/browsing_data/OWNERS

+dullweber@chromium.org
+msramek@chromium.org
+
+# COMPONENT: Privacy

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/OtherFormsOfHistoryDialogFragment.java → chrome/android/java/src/org/chromium/chrome/browser/browsing_data/OtherFormsOfHistoryDialogFragment.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.browsing_data;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -30,9 +30,8 @@ import org.chromium.ui.text.SpanApplier;
 /**
  * Informs the user about the existence of other forms of browsing history.
  */
-public class OtherFormsOfHistoryDialogFragment extends DialogFragment implements
-        DialogInterface.OnClickListener {
-
+public class OtherFormsOfHistoryDialogFragment
+        extends DialogFragment implements DialogInterface.OnClickListener {
     private static final String TAG = "OtherFormsOfHistoryDialogFragment";
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

@@ -30,6 +30,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.IntentHandler;
+import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
@@ -39,7 +40,6 @@ import org.chromium.chrome.browser.preferences.PrefChangeRegistrar.PrefObserver;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataTabsFragment;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
 import org.chromium.chrome.browser.tab.TabLaunchType;

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

-dullweber@chromium.org
-
-# COMPONENT: UI>Browser>Mobile>Settings
-# You should also add component Privacy for issues with code in this directory.

chrome/android/java/src/org/chromium/chrome/browser/sync/SyncUserDataWiper.java

@@ -6,10 +6,10 @@ package org.chromium.chrome.browser.sync;
 
 import org.chromium.base.Promise;
 import org.chromium.chrome.browser.bookmarks.BookmarkModel;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataBridge;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataBridge.OnClearBrowsingDataListener;
 import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
 import org.chromium.chrome.browser.browsing_data.TimePeriod;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataBridge;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataBridge.OnClearBrowsingDataListener;
 
 /**
  * A class to wipe the user's bookmarks and all types of sync data.

chrome/android/java/static_library_dex_reference_workarounds.flags

@@ -20,6 +20,12 @@
 -keep,allowobfuscation class com.google.common.logging.nano.Vr$VREvent$HistogramBucket { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.ChromeActivity { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.flags.ChromeFeatureList { *; }
+-keep,allowobfuscation class org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFetcher { *; }
+-keep,allowobfuscation class org.chromium.chrome.browser.browsing_data.ClearBrowsingDataPreferences { *; }
+-keep,allowobfuscation class org.chromium.chrome.browser.browsing_data.ClearBrowsingDataPreferencesAdvanced { *; }
+-keep,allowobfuscation class org.chromium.chrome.browser.browsing_data.ClearBrowsingDataPreferencesBasic { *; }
+-keep,allowobfuscation class org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment { *; }
+-keep,allowobfuscation class org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment$ClearBrowsingDataPagerAdapter { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.compositor.CompositorViewHolder { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.compositor.CompositorViewHolder$CompositorAccessibilityProvider { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.compositor.layouts.components.VirtualView { *; }
@@ -48,19 +54,7 @@
 -keep,allowobfuscation class org.chromium.chrome.browser.payments.AndroidPaymentApp$** { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.payments.PaymentApp { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.photo_picker.PhotoPickerDialog { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataFetcher { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataPreferences { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataPreferencesAdvanced { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataPreferencesBasic { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment$ClearBrowsingDataPagerAdapter { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.profiles.Profile { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataFetcher { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataPreferences { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataPreferencesAdvanced { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataPreferencesBasic { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataTabsFragment { *; }
--keep,allowobfuscation class org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataTabsFragment$ClearBrowsingDataPagerAdapter { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.tab.Tab { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator { *; }
 -keep,allowobfuscation class org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinatorImpl { *; }

chrome/android/javatests/src/org/chromium/chrome/browser/browserservices/OriginVerifierTest.java

@@ -6,6 +6,8 @@ package org.chromium.chrome.browser.browserservices;
 
 import android.support.test.filters.SmallTest;
 
+import androidx.browser.customtabs.CustomTabsService;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -19,9 +21,9 @@ import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.browserservices.OriginVerifier.OriginVerificationListener;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataBridge;
 import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
 import org.chromium.chrome.browser.browsing_data.TimePeriod;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataBridge;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
@@ -34,8 +36,6 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import androidx.browser.customtabs.CustomTabsService;
-
 /** Tests for OriginVerifier. */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})

chrome/android/javatests/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataBridgeTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridgeTest.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.browsing_data;
 
 import static org.junit.Assert.assertThat;
 
@@ -21,8 +21,6 @@ import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.UserActionTester;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
-import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
-import org.chromium.chrome.browser.browsing_data.TimePeriod;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;

chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java

@@ -16,8 +16,7 @@ import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataBridge;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataBridge.OnClearBrowsingDataListener;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataBridge.OnClearBrowsingDataListener;
 import org.chromium.chrome.browser.webapps.TestFetchStorageCallback;
 import org.chromium.chrome.browser.webapps.WebappInfo;
 import org.chromium.chrome.browser.webapps.WebappRegistry;

chrome/android/javatests/src/org/chromium/chrome/browser/settings/privacy/BrowsingDataTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataTest.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.browsing_data;
 
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
@@ -17,9 +17,6 @@ import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
-import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
-import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTab;
-import org.chromium.chrome.browser.browsing_data.TimePeriod;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content_public.browser.test.util.JavaScriptUtils;

chrome/android/javatests/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragmentBasicTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasicTest.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.browsing_data;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
@@ -24,8 +24,8 @@ import org.chromium.base.CollectionUtil;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment.DialogOption;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataFragment.DialogOption;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;

chrome/android/javatests/src/org/chromium/chrome/browser/settings/privacy/ClearBrowsingDataFragmentTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentTest.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.browsing_data;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -37,11 +37,10 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
-import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTab;
+import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment.DialogOption;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.notifications.channels.SiteChannelsManager;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.privacy.ClearBrowsingDataFragment.DialogOption;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabState;
 import org.chromium.chrome.browser.webapps.TestFetchStorageCallback;

chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/OWNERS

+file://chrome/android/java/src/org/chromium/chrome/browser/browsing_data/OWNERS
+
+# COMPONENT: Privacy

chrome/android/javatests/src/org/chromium/chrome/browser/settings/privacy/OWNERS

-file://chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/OWNERS

chrome/android/javatests/src/org/chromium/chrome/browser/settings/website/ManageSpaceActivityTest.java

@@ -25,7 +25,7 @@ import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataBridge;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataBridge;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content_public.browser.test.util.Criteria;

chrome/browser/android/browsing_data/OWNERS

+file://chrome/android/java/src/org/chromium/chrome/browser/browsing_data/OWNERS
+
+# COMPONENT: Privacy

chrome/browser/android/metrics/javatests/src/org/chromium/chrome/browser/metrics/UkmTest.java

@@ -16,11 +16,11 @@ import org.junit.runner.RunWith;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataBridge;
+import org.chromium.chrome.browser.browsing_data.BrowsingDataBridge.OnClearBrowsingDataListener;
 import org.chromium.chrome.browser.browsing_data.BrowsingDataType;
 import org.chromium.chrome.browser.browsing_data.TimePeriod;
 import org.chromium.chrome.browser.metrics.util.UkmUtilsForTest;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataBridge;
-import org.chromium.chrome.browser.settings.privacy.BrowsingDataBridge.OnClearBrowsingDataListener;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;