[Settings Refactor] Move Sync settings

Move Sync settings alongside Sync code.

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

chrome/android/chrome_java_sources.gni

@@ -1450,11 +1450,6 @@ chrome_java_sources = [
   "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/sync/AccountManagementFragment.java",
-  "java/src/org/chromium/chrome/browser/settings/sync/ManageSyncSettings.java",
-  "java/src/org/chromium/chrome/browser/settings/sync/SignInPreference.java",
-  "java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java",
-  "java/src/org/chromium/chrome/browser/settings/sync/SyncSettingsUtils.java",
   "java/src/org/chromium/chrome/browser/settings/website/AddExceptionPreference.java",
   "java/src/org/chromium/chrome/browser/settings/website/ChosenObjectInfo.java",
   "java/src/org/chromium/chrome/browser/settings/website/ChosenObjectSettings.java",
@@ -1582,6 +1577,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java",
   "java/src/org/chromium/chrome/browser/sync/SyncUserDataWiper.java",
   "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
+  "java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java",
+  "java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java",
+  "java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java",
+  "java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java",
+  "java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java",

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderViewBinder.java

@@ -16,7 +16,7 @@ import org.chromium.chrome.autofill_assistant.R;
 import org.chromium.chrome.browser.autofill_assistant.carousel.AssistantChip;
 import org.chromium.chrome.browser.autofill_assistant.carousel.AssistantChipViewHolder;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
+import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.ui.modelutil.PropertyKey;

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

@@ -10,7 +10,7 @@
         android:key="account_section"
         android:order="0"
         android:title="@string/prefs_section_account"/>
-    <org.chromium.chrome.browser.settings.sync.SignInPreference
+    <org.chromium.chrome.browser.sync.settings.SignInPreference
         android:key="sign_in"
         android:order="1"
         android:title="@string/sign_in_to_chrome"/>
@@ -19,7 +19,7 @@
         android:order="2"
         android:layout="@layout/account_management_account_row"
         android:title="@string/prefs_sync_and_services"
-        android:fragment="org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings"/>
+        android:fragment="org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings"/>
 
     <PreferenceCategory
         android:key="basics_section"

chrome/android/java/res/xml/sync_and_services_preferences.xml

@@ -11,7 +11,7 @@
     <PreferenceCategory
         android:key="user_category"
         android:title="@string/user"/>
-    <org.chromium.chrome.browser.settings.sync.SignInPreference
+    <org.chromium.chrome.browser.sync.settings.SignInPreference
         android:key="sign_in"
         android:title="@string/sign_in_to_chrome"/>
 
@@ -38,7 +38,7 @@
         <org.chromium.chrome.browser.settings.ChromeBasePreference
             android:key="manage_sync"
             android:title="@string/manage_sync_title"
-            android:fragment="org.chromium.chrome.browser.settings.sync.ManageSyncSettings"/>
+            android:fragment="org.chromium.chrome.browser.sync.settings.ManageSyncSettings"/>
     </PreferenceCategory>
 
     <PreferenceCategory

chrome/android/java/src/PRESUBMIT.py

@@ -90,6 +90,7 @@ def _CheckAlertDialogBuilder(input_api, output_api):
       BROWSER_ROOT + 'signin/ConfirmSyncDataStateMachineDelegate.java',
       BROWSER_ROOT + 'signin/SigninFragmentBase.java',
       BROWSER_ROOT + 'signin/SignOutDialogFragment.java',
+      BROWSER_ROOT + 'sync/settings/SyncAndServicesSettings.java',
       BROWSER_ROOT + 'sync/ui/PassphraseCreationDialogFragment.java',
       BROWSER_ROOT + 'sync/ui/PassphraseDialogFragment.java',
       BROWSER_ROOT + 'sync/ui/PassphraseTypeDialogFragment.java',

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java

@@ -16,12 +16,12 @@ import org.chromium.chrome.browser.SyncFirstSetupCompleteSource;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SigninManager.SignInCallback;
 import org.chromium.chrome.browser.signin.UnifiedConsentServiceBridge;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
 import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.metrics.SigninAccessPoint;
 

chrome/android/java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java

@@ -12,10 +12,10 @@ import org.chromium.chrome.browser.SyncFirstSetupCompleteSource;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
 import org.chromium.chrome.browser.services.AndroidEduAndChildAccountHelper;
-import org.chromium.chrome.browser.settings.sync.AccountManagementFragment;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
 import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.ChildAccountStatus;
 import org.chromium.components.signin.metrics.SigninAccessPoint;

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

@@ -19,9 +19,9 @@ import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
-import org.chromium.chrome.browser.settings.sync.SyncSettingsUtils;
-import org.chromium.chrome.browser.settings.sync.SyncSettingsUtils.SyncError;
+import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
+import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
+import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils.SyncError;
 import org.chromium.content_public.browser.WebContents;
 
 import java.lang.annotation.Retention;

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

@@ -27,11 +27,11 @@ 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.sync.SignInPreference;
-import org.chromium.chrome.browser.settings.sync.SyncSettingsUtils;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.chrome.browser.sync.settings.SignInPreference;
+import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
 import org.chromium.chrome.browser.tracing.settings.DeveloperSettings;
 import org.chromium.components.search_engines.TemplateUrl;
 import org.chromium.components.search_engines.TemplateUrlService;

chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java

@@ -23,7 +23,7 @@ import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
 import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
 import org.chromium.chrome.browser.settings.SettingsUtils;
-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
+import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
 import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.text.SpanApplier;

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragment.java

@@ -16,8 +16,8 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.SyncFirstSetupCompleteSource;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
 import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.metrics.SigninAccessPoint;
 

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninUtils.java

@@ -17,7 +17,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.browser.settings.ManagedPreferencesUtils;
-import org.chromium.chrome.browser.settings.sync.AccountManagementFragment;
+import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.components.signin.GAIAServiceType;
 import org.chromium.components.signin.metrics.SigninAccessPoint;

chrome/android/java/src/org/chromium/chrome/browser/signin/SyncPromoView.java

@@ -18,8 +18,8 @@ import android.widget.TextView;
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
 import org.chromium.chrome.browser.signin.SigninActivity.AccessPoint;
+import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.components.signin.metrics.SigninAccessPoint;
 import org.chromium.components.sync.AndroidSyncSettings;

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

@@ -25,9 +25,9 @@ import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
 import org.chromium.chrome.browser.notifications.PendingIntentProvider;
 import org.chromium.chrome.browser.notifications.channels.ChannelDefinitions;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.sync.GoogleServiceAuthError.State;
+import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
 import org.chromium.chrome.browser.sync.ui.PassphraseActivity;
 import org.chromium.components.signin.base.CoreAccountInfo;
 import org.chromium.components.sync.AndroidSyncSettings;

chrome/android/java/src/org/chromium/chrome/browser/settings/sync/AccountManagementFragment.java → chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.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.sync;
+package org.chromium.chrome.browser.sync.settings;
 
 import android.accounts.Account;
 import android.annotation.TargetApi;

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

chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SignInPreference.java → chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.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.sync;
+package org.chromium.chrome.browser.sync.settings;
 
 import android.content.Context;
 import android.support.v7.content.res.AppCompatResources;

chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncAndServicesSettings.java → chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.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.sync;
+package org.chromium.chrome.browser.sync.settings;
 
 import android.accounts.Account;
 import android.app.Dialog;
@@ -54,11 +54,11 @@ import org.chromium.chrome.browser.settings.SettingsActivity;
 import org.chromium.chrome.browser.settings.SettingsUtils;
 import org.chromium.chrome.browser.settings.password.PasswordUIView;
 import org.chromium.chrome.browser.settings.privacy.PrivacyPreferencesManager;
-import org.chromium.chrome.browser.settings.sync.SyncSettingsUtils.SyncError;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.UnifiedConsentServiceBridge;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.sync.TrustedVaultClient;
+import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils.SyncError;
 import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.components.signin.AccountManagerFacade;

chrome/android/java/src/org/chromium/chrome/browser/settings/sync/SyncSettingsUtils.java → chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java

 // Copyright 2019 The Chromium Authors. All rights reserved.
 // 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.sync;
+package org.chromium.chrome.browser.sync.settings;
 
 import android.app.Activity;
 import android.content.Context;

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

@@ -17,10 +17,10 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.NativeInitObserver;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.ProfileDataCache;
 import org.chromium.chrome.browser.signin.SigninManager;
+import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;

chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninSignoutIntegrationTest.java

@@ -35,7 +35,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics;
-import org.chromium.chrome.browser.settings.sync.AccountManagementFragment;
+import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.ActivityUtils;

chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninTest.java

@@ -40,8 +40,8 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.MainSettings;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.sync.AccountManagementFragment;
-import org.chromium.chrome.browser.settings.sync.SignInPreference;
+import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
+import org.chromium.chrome.browser.sync.settings.SignInPreference;
 import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;

chrome/android/javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java

@@ -31,7 +31,7 @@ import org.chromium.chrome.browser.firstrun.FirstRunActivity.FirstRunActivityObs
 import org.chromium.chrome.browser.firstrun.FirstRunFlowSequencer;
 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.sync.AccountManagementFragment;
+import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.ActivityUtils;
 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;

chrome/android/javatests/src/org/chromium/chrome/browser/sync/ManageSyncSettingsTest.java

@@ -30,7 +30,7 @@ import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.settings.sync.ManageSyncSettings;
+import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
 import org.chromium.chrome.browser.sync.ui.PassphraseCreationDialogFragment;
 import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment;
 import org.chromium.chrome.browser.sync.ui.PassphraseTypeDialogFragment;

chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncAndServicesSettingsTest.java

@@ -31,7 +31,7 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 import org.chromium.chrome.browser.settings.SettingsActivity;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
-import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
+import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.ApplicationTestUtils;
 import org.chromium.chrome.test.util.browser.Features.DisableFeatures;