Create new signin directory for files related to sync and signin

Sync and Signin files in preferences directory currently does not have an
owner. We want to move these files to a dedicated folder for sync so
that reviewers have a better context about cls.

Bug: 928406
Change-Id: I8137dfbf3f2861ad8507bd1f6843c616e3ab1201
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1657900Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Tanmoy Mollik <triploblastic@google.com>
Cr-Commit-Position: refs/heads/master@{#672039}

chrome/android/chrome_java_sources.gni

@@ -1232,7 +1232,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegate.java",
   "java/src/org/chromium/chrome/browser/preferences/ManagedPreferenceDelegateCompat.java",
   "java/src/org/chromium/chrome/browser/preferences/ManagedPreferencesUtils.java",
-  "java/src/org/chromium/chrome/browser/preferences/ManageSyncPreferences.java",
   "java/src/org/chromium/chrome/browser/preferences/NotificationsPreferences.java",
   "java/src/org/chromium/chrome/browser/preferences/PrefChangeRegistrar.java",
   "java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java",
@@ -1245,11 +1244,12 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/preferences/SeekBarPreference.java",
   "java/src/org/chromium/chrome/browser/preferences/SignInPreference.java",
   "java/src/org/chromium/chrome/browser/preferences/SpinnerPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/SyncAndServicesPreferences.java",
-  "java/src/org/chromium/chrome/browser/preferences/SyncErrorCardPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/SyncPreference.java",
-  "java/src/org/chromium/chrome/browser/preferences/SyncPreferenceUtils.java",
-  "java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java",
+  "java/src/org/chromium/chrome/browser/preferences/sync/ManageSyncPreferences.java",
+  "java/src/org/chromium/chrome/browser/preferences/sync/SyncAndServicesPreferences.java",
+  "java/src/org/chromium/chrome/browser/preferences/sync/SyncErrorCardPreference.java",
+  "java/src/org/chromium/chrome/browser/preferences/sync/SyncPreference.java",
+  "java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.java",
+  "java/src/org/chromium/chrome/browser/preferences/sync/SyncedAccountPreference.java",
   "java/src/org/chromium/chrome/browser/preferences/TextAndButtonPreference.java",
   "java/src/org/chromium/chrome/browser/preferences/TextMessagePreference.java",
   "java/src/org/chromium/chrome/browser/preferences/TextMessagePreferenceCompat.java",

chrome/android/java/res/xml/account_management_preferences.xml

@@ -31,7 +31,7 @@
         android:key="child_content_divider"
         android:layout="@layout/divider_preference"/>
 
-    <org.chromium.chrome.browser.preferences.SyncPreference
+    <org.chromium.chrome.browser.preferences.sync.SyncPreference
         android:key="sync_settings"
         android:title="@string/sign_in_sync"/>
 

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

@@ -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.preferences.SyncAndServicesPreferences"/>
+        android:fragment="org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences"/>
 
     <PreferenceCategory
         android:key="basics_section"

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

@@ -35,7 +35,7 @@
         <org.chromium.chrome.browser.preferences.ChromeBasePreference
             android:key="manage_sync"
             android:title="@string/manage_sync_title"
-            android:fragment="org.chromium.chrome.browser.preferences.ManageSyncPreferences"/>
+            android:fragment="org.chromium.chrome.browser.preferences.sync.ManageSyncPreferences"/>
     </PreferenceCategory>
 
     <PreferenceCategory

chrome/android/java/res/xml/sync_customization_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.preferences.SyncErrorCardPreference
+    <org.chromium.chrome.browser.preferences.sync.SyncErrorCardPreference
         android:key="sync_error_card"
         android:icon="@drawable/sync_error"
         app:iconTint="@color/default_red"
@@ -17,7 +17,7 @@
         android:title="@string/sign_in_sync"
         android:summary="@string/sync_description" />
 
-    <org.chromium.chrome.browser.preferences.SyncedAccountPreference
+    <org.chromium.chrome.browser.preferences.sync.SyncedAccountPreference
         android:key="synced_account" />
 
     <PreferenceCategory

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

@@ -13,7 +13,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
-import org.chromium.chrome.browser.preferences.SyncAndServicesPreferences;
+import org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences;
 import org.chromium.chrome.browser.signin.AccountManagementFragment;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SigninManager.SignInCallback;

chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
 import org.chromium.chrome.browser.preferences.autofill_assistant.AutofillAssistantPreferences;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferenceFragment;
 import org.chromium.chrome.browser.preferences.developer.DeveloperPreferences;
+import org.chromium.chrome.browser.preferences.sync.SyncPreferenceUtils;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.sync.ProfileSyncService;

chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

@@ -17,6 +17,7 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
+import org.chromium.chrome.browser.preferences.sync.SyncPreferenceUtils;
 import org.chromium.chrome.browser.signin.AccountManagementFragment;
 import org.chromium.chrome.browser.signin.AccountSigninActivity;
 import org.chromium.chrome.browser.signin.DisplayableProfileData;
@@ -85,7 +86,7 @@ public class SignInPreference
     /**
      * Starts listening for updates to the sign-in and sync state.
      */
-    void registerForUpdates() {
+    public void registerForUpdates() {
         AccountManagerFacade.get().addObserver(this);
         SigninManager.get().addSignInAllowedObserver(this);
         mProfileDataCache.addObserver(this);
@@ -104,7 +105,7 @@ public class SignInPreference
      * Stops listening for updates to the sign-in and sync state. Every call to registerForUpdates()
      * must be matched with a call to this method.
      */
-    void unregisterForUpdates() {
+    public void unregisterForUpdates() {
         AccountManagerFacade.get().removeObserver(this);
         SigninManager.get().removeSignInAllowedObserver(this);
         mProfileDataCache.removeObserver(this);

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java

@@ -26,7 +26,7 @@ import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.PreferenceUtils;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
-import org.chromium.chrome.browser.preferences.SyncAndServicesPreferences;
+import org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
 import org.chromium.ui.text.NoUnderlineClickableSpan;

chrome/android/java/src/org/chromium/chrome/browser/preferences/ManageSyncPreferences.java → chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/ManageSyncPreferences.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.preferences;
+package org.chromium.chrome.browser.preferences.sync;
 
 import android.app.DialogFragment;
 import android.app.FragmentManager;
@@ -29,6 +29,8 @@ import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.invalidation.InvalidationController;
+import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
+import org.chromium.chrome.browser.preferences.PreferenceUtils;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.sync.ui.PassphraseCreationDialogFragment;

chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/OWNERS

+bsazonov@chromium.org
+treib@chromium.org
+
+# TEAM: chrome-signin@chromium.org
+# COMPONENT: Services>SignIn

chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncAndServicesPreferences.java → chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncAndServicesPreferences.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.preferences;
+package org.chromium.chrome.browser.preferences.sync;
 
 import android.accounts.Account;
 import android.app.Dialog;
@@ -41,6 +41,12 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.invalidation.InvalidationController;
 import org.chromium.chrome.browser.metrics.UmaSessionStats;
+import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
+import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
+import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+import org.chromium.chrome.browser.preferences.PreferenceUtils;
+import org.chromium.chrome.browser.preferences.Preferences;
+import org.chromium.chrome.browser.preferences.SignInPreference;
 import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninManager;

chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncErrorCardPreference.java → chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncErrorCardPreference.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.preferences;
+package org.chromium.chrome.browser.preferences.sync;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -13,6 +13,7 @@ import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.preferences.ChromeBasePreference;
 import org.chromium.ui.UiUtils;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncPreference.java → chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreference.java

 // Copyright 2016 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.preferences;
+package org.chromium.chrome.browser.preferences.sync;
 
 import android.content.Context;
 import android.preference.Preference;

chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncPreferenceUtils.java → chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncPreferenceUtils.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.preferences;
+package org.chromium.chrome.browser.preferences.sync;
 
 import android.app.Activity;
 import android.content.Context;

chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java → chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SyncedAccountPreference.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.preferences;
+package org.chromium.chrome.browser.preferences.sync;
 
 import android.accounts.Account;
 import android.content.Context;

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

@@ -39,7 +39,7 @@ import org.chromium.chrome.browser.preferences.ChromeBasePreference;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
-import org.chromium.chrome.browser.preferences.SyncPreference;
+import org.chromium.chrome.browser.preferences.sync.SyncPreference;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics;
 import org.chromium.chrome.browser.signin.SignOutDialogFragment.SignOutDialogListener;

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

@@ -13,7 +13,7 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
-import org.chromium.chrome.browser.preferences.SyncAndServicesPreferences;
+import org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

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

@@ -9,7 +9,7 @@ import android.preference.Preference.OnPreferenceChangeListener;
 import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
 
-import org.chromium.chrome.browser.preferences.SyncedAccountPreference;
+import org.chromium.chrome.browser.preferences.sync.SyncedAccountPreference;
 import org.chromium.chrome.browser.signin.AccountSigninActivity;
 import org.chromium.chrome.browser.signin.ConfirmImportSyncDataDialog;
 import org.chromium.chrome.browser.signin.ConfirmImportSyncDataDialog.ImportSyncType;

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

@@ -25,7 +25,7 @@ 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.preferences.PreferencesLauncher;
-import org.chromium.chrome.browser.preferences.SyncAndServicesPreferences;
+import org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences;
 import org.chromium.chrome.browser.signin.AccountManagementFragment;
 import org.chromium.chrome.browser.sync.GoogleServiceAuthError.State;
 import org.chromium.chrome.browser.sync.ui.PassphraseActivity;

chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java

@@ -37,8 +37,8 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.invalidation.InvalidationController;
 import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
-import org.chromium.chrome.browser.preferences.SyncPreferenceUtils;
-import org.chromium.chrome.browser.preferences.SyncedAccountPreference;
+import org.chromium.chrome.browser.preferences.sync.SyncPreferenceUtils;
+import org.chromium.chrome.browser.preferences.sync.SyncedAccountPreference;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SignoutReason;

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

@@ -15,7 +15,7 @@ import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.NativeInitObserver;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
-import org.chromium.chrome.browser.preferences.SyncAndServicesPreferences;
+import org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.ProfileDataCache;
 import org.chromium.chrome.browser.signin.SigninManager;