[Settings Refactor] Move About Chrome Settings

Move About Chrome Settings to org.chromium.chrome.browser.about_settings
package.

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

chrome/android/BUILD.gn

@@ -2603,6 +2603,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/ShortcutHelper.java",
     "java/src/org/chromium/chrome/browser/WarmupManager.java",
     "java/src/org/chromium/chrome/browser/WebContentsFactory.java",
+    "java/src/org/chromium/chrome/browser/about_settings/AboutSettingsBridge.java",
     "java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java",
     "java/src/org/chromium/chrome/browser/announcement/AnnouncementNotificationManager.java",
     "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowBridge.java",
@@ -2824,7 +2825,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfInfoBar.java",
     "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfModelObserverBridge.java",
     "java/src/org/chromium/chrome/browser/send_tab_to_self/TargetDeviceInfo.java",
-    "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/PrivacyPreferencesManager.java",

chrome/android/chrome_java_sources.gni

@@ -61,6 +61,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/WebContentsFactory.java",
   "java/src/org/chromium/chrome/browser/WindowDelegate.java",
   "java/src/org/chromium/chrome/browser/ZoomController.java",
+  "java/src/org/chromium/chrome/browser/about_settings/AboutChromePreferenceOSVersion.java",
+  "java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java",
+  "java/src/org/chromium/chrome/browser/about_settings/AboutSettingsBridge.java",
+  "java/src/org/chromium/chrome/browser/about_settings/LegalInformationSettings.java",
   "java/src/org/chromium/chrome/browser/accessibility/FontSizePrefs.java",
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelAdapter.java",
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelListItem.java",
@@ -1383,10 +1387,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/MainSettings.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java",
   "java/src/org/chromium/chrome/browser/settings/SettingsLauncher.java",
-  "java/src/org/chromium/chrome/browser/settings/about/AboutChromePreferenceOSVersion.java",
-  "java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java",
-  "java/src/org/chromium/chrome/browser/settings/about/AboutSettingsBridge.java",
-  "java/src/org/chromium/chrome/browser/settings/about/LegalInformationSettings.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",

chrome/android/chrome_junit_test_java_sources.gni

@@ -7,6 +7,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/SSLClientCertificateRequestTest.java",
   "junit/src/org/chromium/chrome/browser/ShadowDeviceConditions.java",
   "junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java",
+  "junit/src/org/chromium/chrome/browser/about_settings/AboutSettingsBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/autofill/AutofillUiUtilsTest.java",
   "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskSchedulerTest.java",
   "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskTest.java",
@@ -177,7 +178,6 @@ chrome_junit_test_java_sources = [
   "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",
-  "junit/src/org/chromium/chrome/browser/settings/about/AboutSettingsBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/settings/password/DialogManagerTest.java",
   "junit/src/org/chromium/chrome/browser/settings/password/EnsureAsyncPostingRule.java",
   "junit/src/org/chromium/chrome/browser/settings/password/ExportWarningDialogFragmentTest.java",

chrome/android/java/res/xml/about_chrome_preferences.xml

@@ -7,11 +7,11 @@
     <Preference
         android:key="application_version"
         android:title="@string/application_version_title" />
-    <org.chromium.chrome.browser.settings.about.AboutChromePreferenceOSVersion
+    <org.chromium.chrome.browser.about_settings.AboutChromePreferenceOSVersion
         android:key="os_version"
         android:title="@string/os_version_title" />
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.about.LegalInformationSettings"
+        android:fragment="org.chromium.chrome.browser.about_settings.LegalInformationSettings"
         android:key="legal_information"
         android:title="@string/legal_information_title" />
 </PreferenceScreen>

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

@@ -101,7 +101,7 @@
         android:order="18"
         android:title="Developer options"/>
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.about.AboutChromeSettings"
+        android:fragment="org.chromium.chrome.browser.about_settings.AboutChromeSettings"
         android:key="about_chrome"
         android:order="19"
         android:title="@string/prefs_about_chrome"/>

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

chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java → chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.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.about;
+package org.chromium.chrome.browser.about_settings;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;

chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutSettingsBridge.java → chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutSettingsBridge.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.about;
+package org.chromium.chrome.browser.about_settings;
 
 import org.chromium.base.annotations.NativeMethods;
 

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

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

+chouinard@chromium.org
+twellington@chromium.org
+
+# COMPONENT: UI>Browser>Mobile>Settings

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

@@ -4,10 +4,10 @@
 
 package org.chromium.chrome.browser.datareduction;
 
+import org.chromium.chrome.browser.about_settings.AboutSettingsBridge;
 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.about.AboutSettingsBridge;
 
 /**
  * Helper functions for displaying the various data reduction proxy promos. The promo screens

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

@@ -14,11 +14,11 @@ import androidx.annotation.DrawableRes;
 import org.chromium.base.CommandLine;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.about_settings.AboutSettingsBridge;
 import org.chromium.chrome.browser.datareduction.DataReductionPromoUtils;
 import org.chromium.chrome.browser.omaha.VersionNumberGetter;
-import org.chromium.chrome.browser.settings.about.AboutSettingsBridge;
-import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.chrome.browser.ui.messages.infobar.InfoBarControlLayout;
+import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.GURLUtils;
 

chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java

@@ -31,6 +31,7 @@ import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeVersionInfo;
+import org.chromium.chrome.browser.about_settings.AboutChromeSettings;
 import org.chromium.chrome.browser.init.BrowserParts;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.init.EmptyBrowserParts;
@@ -39,7 +40,6 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.about.AboutChromeSettings;
 import org.chromium.chrome.browser.site_settings.Website.StoredDataClearedCallback;
 import org.chromium.chrome.browser.util.ConversionUtils;
 

chrome/android/javatests/src/org/chromium/chrome/browser/datareduction/DataReductionPromoUtilsTest.java

@@ -23,9 +23,9 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.AdvancedMockContext;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.browser.about_settings.AboutSettingsBridge;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
-import org.chromium.chrome.browser.settings.about.AboutSettingsBridge;
 import org.chromium.chrome.test.ChromeBrowserTestRule;
 
 /**

chrome/android/junit/src/org/chromium/chrome/browser/settings/about/AboutSettingsBridgeTest.java → chrome/android/junit/src/org/chromium/chrome/browser/about_settings/AboutSettingsBridgeTest.java

@@ -4,7 +4,7 @@
 
 // generate_java_test.py
 
-package org.chromium.chrome.browser.settings.about;
+package org.chromium.chrome.browser.about_settings;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doReturn;

chrome/android/junit/src/org/chromium/chrome/browser/about_settings/OWNERS

+file://chrome/android/java/src/org/chromium/chrome/browser/about_settings/OWNERS