Reland "Move settings.homepage to homepage"

This reverts commit e6de1039.

Reason for revert: The crash was caused by a xml text failure. The original change also delete one of the test file unintentionally. A fix will be update as a patch set of this CL.

Original change's description:
> Revert "Move settings.homepage to homepage"
>
> This reverts commit e2054b9b.
>
> Reason for revert: this CL cause crashing. Tracked in crbug.com/1062959
>
> Original change's description:
> > Move settings.homepage to homepage
> >
> > Moving Homepage related settings code to homepage.settings package
> >
> > Change-Id: Iaf198f4a25cc03b32a1de997577d466916470437
> > Bug: 1052060
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095468
> > Commit-Queue: Wenyu Fu <wenyufu@chromium.org>
> > Reviewed-by: Theresa  <twellington@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#751162}
>
> TBR=twellington@chromium.org,wychen@chromium.org,wenyufu@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 1052060
> Change-Id: I97b75da16bf58834ba555242476b9e3f7bfd71be
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109816
> Auto-Submit: Wenyu Fu <wenyufu@chromium.org>
> Reviewed-by: Theresa  <twellington@chromium.org>
> Commit-Queue: Wenyu Fu <wenyufu@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#751748}

TBR=twellington@chromium.org,wychen@chromium.org,wenyufu@chromium.org

Bug: 1052060
Change-Id: I0f0a1200755471478feb6966b21211694dd9710e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2125467Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Wenyu Fu <wenyufu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755420}

chrome/android/chrome_java_sources.gni

@@ -803,6 +803,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/historyreport/SearchJniBridge.java",
   "java/src/org/chromium/chrome/browser/historyreport/UsageReport.java",
   "java/src/org/chromium/chrome/browser/homepage/HomepagePolicyManager.java",
+  "java/src/org/chromium/chrome/browser/homepage/settings/HomepageEditor.java",
+  "java/src/org/chromium/chrome/browser/homepage/settings/HomepageMetricsEnums.java",
+  "java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java",
+  "java/src/org/chromium/chrome/browser/homepage/settings/RadioButtonGroupHomepagePreference.java",
   "java/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGenerator.java",
   "java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGenerator.java",
   "java/src/org/chromium/chrome/browser/identity/UniqueIdentificationGeneratorFactory.java",
@@ -1421,10 +1425,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/homepage/HomepageEditor.java",
-  "java/src/org/chromium/chrome/browser/settings/homepage/HomepageMetricsEnums.java",
-  "java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java",
-  "java/src/org/chromium/chrome/browser/settings/homepage/RadioButtonGroupHomepagePreference.java",
   "java/src/org/chromium/chrome/browser/share/LensUtils.java",
   "java/src/org/chromium/chrome/browser/share/OptionalShareTargetsManager.java",
   "java/src/org/chromium/chrome/browser/share/ShareActivity.java",

chrome/android/chrome_test_java_sources.gni

@@ -205,6 +205,8 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/homepage/HomepageTestRule.java",
+  "javatests/src/org/chromium/chrome/browser/homepage/settings/HomepageSettingsFragmentTest.java",
+  "javatests/src/org/chromium/chrome/browser/homepage/settings/HomepageSettingsFragmentWithEditorTest.java",
   "javatests/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGeneratorTest.java",
   "javatests/src/org/chromium/chrome/browser/identity/UniqueIdentificationGeneratorFactoryTest.java",
   "javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java",
@@ -430,8 +432,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/services/GoogleServicesManagerIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/MainSettingsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/SettingsActivityTest.java",
-  "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/language/LanguageSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/shape_detection/ShapeDetectionTest.java",
   "javatests/src/org/chromium/chrome/browser/share/LensUtilsTest.java",

chrome/android/java/res/xml/homepage_preferences.xml

@@ -16,9 +16,9 @@
         android:key="homepage_edit"
         android:title="@string/options_homepage_edit_label"
         android:visibility="gone"
-        android:fragment="org.chromium.chrome.browser.settings.homepage.HomepageEditor" />
+        android:fragment="org.chromium.chrome.browser.homepage.settings.HomepageEditor" />
 
-    <org.chromium.chrome.browser.settings.homepage.RadioButtonGroupHomepagePreference
+    <org.chromium.chrome.browser.homepage.settings.RadioButtonGroupHomepagePreference
         android:key="homepage_radio_group"
         android:visibility="gone"
         android:selectable="false"

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

@@ -51,7 +51,7 @@
         android:order="8"
         android:title="@string/prefs_notifications"/>
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.homepage.HomepageSettings"
+        android:fragment="org.chromium.chrome.browser.homepage.settings.HomepageSettings"
         android:key="homepage"
         android:order="9"
         android:title="@string/options_homepage_title"/>

chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageEditor.java → chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageEditor.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.homepage;
+package org.chromium.chrome.browser.homepage.settings;
 
 import android.os.Bundle;
 import android.text.Editable;

chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageMetricsEnums.java → chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageMetricsEnums.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.homepage;
+package org.chromium.chrome.browser.homepage.settings;
 
 import androidx.annotation.IntDef;
 

chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java → chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.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.homepage;
+package org.chromium.chrome.browser.homepage.settings;
 
 import android.os.Bundle;
 
@@ -14,11 +14,11 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.homepage.HomepagePolicyManager;
+import org.chromium.chrome.browser.homepage.settings.RadioButtonGroupHomepagePreference.HomepageOption;
+import org.chromium.chrome.browser.homepage.settings.RadioButtonGroupHomepagePreference.PreferenceValues;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
-import org.chromium.chrome.browser.settings.homepage.RadioButtonGroupHomepagePreference.HomepageOption;
-import org.chromium.chrome.browser.settings.homepage.RadioButtonGroupHomepagePreference.PreferenceValues;
 import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.SettingsUtils;

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

chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java

@@ -15,11 +15,11 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.browser.flags.CachedFeatureFlags;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.homepage.HomepagePolicyManager;
+import org.chromium.chrome.browser.homepage.settings.HomepageMetricsEnums.HomeButtonPreferenceState;
+import org.chromium.chrome.browser.homepage.settings.HomepageMetricsEnums.HomepageLocationType;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
-import org.chromium.chrome.browser.settings.homepage.HomepageMetricsEnums.HomeButtonPreferenceState;
-import org.chromium.chrome.browser.settings.homepage.HomepageMetricsEnums.HomepageLocationType;
 import org.chromium.components.embedder_support.util.UrlConstants;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/toolbar/HomeButton.java

@@ -28,10 +28,10 @@ import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeState;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.homepage.HomepagePolicyManager;
+import org.chromium.chrome.browser.homepage.settings.HomepageSettings;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.homepage.HomepageSettings;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration;
 import org.chromium.ui.widget.ChromeImageButton;

chrome/android/javatests/src/org/chromium/chrome/browser/homepage/HomepagePolicyIntegrationTest.java

@@ -27,13 +27,13 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
+import org.chromium.chrome.browser.homepage.settings.HomepageMetricsEnums.HomeButtonPreferenceState;
+import org.chromium.chrome.browser.homepage.settings.HomepageMetricsEnums.HomepageLocationType;
+import org.chromium.chrome.browser.homepage.settings.HomepageSettings;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.homepage.HomepageMetricsEnums.HomeButtonPreferenceState;
-import org.chromium.chrome.browser.settings.homepage.HomepageMetricsEnums.HomepageLocationType;
-import org.chromium.chrome.browser.settings.homepage.HomepageSettings;
 import org.chromium.chrome.browser.toolbar.HomeButton;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;

chrome/android/javatests/src/org/chromium/chrome/browser/settings/homepage/HomepageSettingsFragmentTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/homepage/settings/HomepageSettingsFragmentTest.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.homepage;
+package org.chromium.chrome.browser.homepage.settings;
 
 import android.support.test.filters.SmallTest;
 import android.view.View;
@@ -20,11 +20,11 @@ import org.chromium.base.test.util.UserActionTester;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.homepage.HomepageTestRule;
+import org.chromium.chrome.browser.homepage.settings.HomepageMetricsEnums.HomepageLocationType;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.homepage.HomepageMetricsEnums.HomepageLocationType;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.Features;

chrome/android/javatests/src/org/chromium/chrome/browser/settings/homepage/HomepageSettingsFragmentWithEditorTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/homepage/settings/HomepageSettingsFragmentWithEditorTest.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.homepage;
+package org.chromium.chrome.browser.homepage.settings;
 
 import android.support.test.filters.SmallTest;
 
@@ -94,6 +94,13 @@ public class HomepageSettingsFragmentWithEditorTest {
 
         Assert.assertNotNull("Switch preference is Null", mSwitch);
         Assert.assertNotNull("Homepage Edit is Null", mHomepageEditor);
+
+        try {
+            Assert.assertEquals("HomepageEditor does not hold a valid fragment.",
+                    Class.forName(mHomepageEditor.getFragment()), HomepageEditor.class);
+        } catch (ClassNotFoundException e) {
+            throw new AssertionError("Fragment class for HomepageEditor is not found.");
+        }
     }
 
     @Test

chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.java

@@ -27,9 +27,9 @@ import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
+import org.chromium.chrome.browser.homepage.settings.HomepageEditor;
+import org.chromium.chrome.browser.homepage.settings.HomepageSettings;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.homepage.HomepageEditor;
-import org.chromium.chrome.browser.settings.homepage.HomepageSettings;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabList;
 import org.chromium.chrome.browser.tabmodel.TabModel;

chrome/android/javatests/src/org/chromium/chrome/browser/settings/MainSettingsFragmentTest.java

@@ -31,6 +31,7 @@ import org.chromium.chrome.browser.datareduction.settings.DataReductionPreferenc
 import org.chromium.chrome.browser.download.settings.DownloadSettings;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.homepage.HomepageTestRule;
+import org.chromium.chrome.browser.homepage.settings.HomepageSettings;
 import org.chromium.chrome.browser.language.settings.LanguageSettings;
 import org.chromium.chrome.browser.night_mode.NightModeUtils;
 import org.chromium.chrome.browser.night_mode.settings.ThemeSettingsFragment;
@@ -39,7 +40,6 @@ import org.chromium.chrome.browser.password_manager.settings.PasswordSettings;
 import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
-import org.chromium.chrome.browser.settings.homepage.HomepageSettings;
 import org.chromium.chrome.browser.site_settings.SiteSettings;
 import org.chromium.chrome.browser.sync.SyncTestRule;
 import org.chromium.chrome.browser.sync.settings.SignInPreference;

chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/HomeButtonTest.java

@@ -28,9 +28,9 @@ import org.mockito.MockitoAnnotations;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.homepage.HomepageTestRule;
+import org.chromium.chrome.browser.homepage.settings.HomepageSettings;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.homepage.HomepageSettings;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.chrome.test.util.browser.Features.DisableFeatures;