Revert "[Settings Refactor] Move autofill settings"

This reverts commit 359bdf76.

Reason for revert: Proguard removes fragments in release mode

Original change's description:
> [Settings Refactor] Move autofill settings
> 
> Move autofill settings alongside autofill code.
> 
> Bug: 1047357
> Change-Id: Id5679d4392e23cff775dfcefa41930af9ab0f602
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2031538
> Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
> Reviewed-by: Theresa  <twellington@chromium.org>
> Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#737874}

TBR=rouslan@chromium.org,twellington@chromium.org,chouinard@chromium.org

Change-Id: I56bcf1ea3cdb276ee18d242ab858531f8081d673
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1047357
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036635Reviewed-by: Natalie Chouinard <chouinard@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737928}

chrome/android/BUILD.gn

@@ -2561,7 +2561,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill/CreditCardScannerBridge.java",
     "java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java",
     "java/src/org/chromium/chrome/browser/autofill/PhoneNumberUtil.java",
-    "java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfileBridge.java",
     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java",
     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
     "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncPwaDetector.java",
@@ -2776,6 +2775,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/send_tab_to_self/TargetDeviceInfo.java",
     "java/src/org/chromium/chrome/browser/settings/NfcSystemLevelSetting.java",
     "java/src/org/chromium/chrome/browser/settings/about/AboutSettingsBridge.java",
+    "java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfileBridge.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",

chrome/android/chrome_java_sources.gni

@@ -102,19 +102,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/autofill/prefeditor/ExpandableGridView.java",
   "java/src/org/chromium/chrome/browser/autofill/prefeditor/HintedDropDownAdapter.java",
   "java/src/org/chromium/chrome/browser/autofill/prefeditor/HintedDropDownAdapterWithPlusIcon.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppPreference.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillCreditCardEditor.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillEditLinkPreference.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillEditorBase.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditor.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfileBridge.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfileEditorPreference.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerCardEditor.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerProfileFragment.java",
-  "java/src/org/chromium/chrome/browser/autofill/settings/CreditCardNumberFormattingTextWatcher.java",
   "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTask.java",
   "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskScheduler.java",
   "java/src/org/chromium/chrome/browser/background_sync/BackgroundSyncPwaDetector.java",
@@ -1388,6 +1375,19 @@ chrome_java_sources = [
   "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/autofill/AndroidPaymentAppPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppsFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillCreditCardEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillEditLinkPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillEditorBase.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillLocalCardEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillPaymentMethodsFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfileBridge.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfileEditorPreference.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerCardEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerProfileFragment.java",
+  "java/src/org/chromium/chrome/browser/settings/autofill/CreditCardNumberFormattingTextWatcher.java",
   "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionDataUseItem.java",
   "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionPreferenceFragment.java",
   "java/src/org/chromium/chrome/browser/settings/datareduction/DataReductionSiteBreakdownView.java",

chrome/android/chrome_test_java_sources.gni

@@ -56,8 +56,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillUpstreamTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java",
-  "javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java",
-  "javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillTestRule.java",
   "javatests/src/org/chromium/chrome/browser/background_sync/BackgroundSyncTest.java",
   "javatests/src/org/chromium/chrome/browser/background_sync/PeriodicBackgroundSyncTest.java",
   "javatests/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java",
@@ -411,6 +409,8 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/settings/PasswordViewingTypeTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/SettingsActivityTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/accessibility/AccessibilitySettingsTest.java",
+  "javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragmentTest.java",
+  "javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillTestRule.java",
   "javatests/src/org/chromium/chrome/browser/settings/datareduction/DataReductionStatsPreferenceTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/developer/TracingSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/notifications/NotificationsSettingsTest.java",

chrome/android/java/res/xml/autofill_server_profile_preferences.xml

@@ -9,7 +9,7 @@
         android:key="server_profile_description"
         android:selectable="false" />
 
-    <org.chromium.chrome.browser.autofill.settings.AutofillEditLinkPreference
+    <org.chromium.chrome.browser.settings.autofill.AutofillEditLinkPreference
         android:key="server_profile_edit_link" />
 
 </PreferenceScreen>

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

@@ -36,12 +36,12 @@
         android:order="5"
         android:title="@string/password_settings_title"/>
     <org.chromium.chrome.browser.settings.ChromeBasePreference
-        android:fragment="org.chromium.chrome.browser.autofill.settings.AutofillPaymentMethodsFragment"
+        android:fragment="org.chromium.chrome.browser.settings.autofill.AutofillPaymentMethodsFragment"
         android:key="autofill_payment_methods"
         android:order="6"
         android:title="@string/autofill_payment_methods"/>
     <org.chromium.chrome.browser.settings.ChromeBasePreference
-        android:fragment="org.chromium.chrome.browser.autofill.settings.AutofillProfilesFragment"
+        android:fragment="org.chromium.chrome.browser.settings.autofill.AutofillProfilesFragment"
         android:key="autofill_addresses"
         android:order="7"
         android:title="@string/autofill_addresses_settings_title"/>

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

@@ -15,9 +15,9 @@ import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ResourceId;
-import org.chromium.chrome.browser.autofill.settings.AutofillEditorBase;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+import org.chromium.chrome.browser.settings.autofill.AutofillEditorBase;
 import org.chromium.content_public.browser.WebContents;
 
 import java.util.ArrayList;

chrome/android/java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorDialog.java

@@ -42,10 +42,10 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.autofill.settings.CreditCardNumberFormattingTextWatcher;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.chrome.browser.settings.autofill.CreditCardNumberFormattingTextWatcher;
 import org.chromium.components.browser_ui.widget.AlwaysDismissedDialog;
 import org.chromium.components.browser_ui.widget.FadingEdgeScrollView;
 import org.chromium.components.browser_ui.widget.TintedDrawable;

chrome/android/java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorDropdownField.java

@@ -25,7 +25,7 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge.DropdownKeyValue;
+import org.chromium.chrome.browser.settings.autofill.AutofillProfileBridge.DropdownKeyValue;
 import org.chromium.ui.KeyboardVisibilityDelegate;
 
 import java.util.ArrayList;

chrome/android/java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorFieldModel.java

@@ -12,7 +12,7 @@ import androidx.annotation.Nullable;
 
 import org.chromium.base.Callback;
 import org.chromium.base.ContextUtils;
-import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge.DropdownKeyValue;
+import org.chromium.chrome.browser.settings.autofill.AutofillProfileBridge.DropdownKeyValue;
 
 import java.util.ArrayList;
 import java.util.HashMap;

chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java

@@ -22,10 +22,10 @@ import org.chromium.chrome.browser.autofill.prefeditor.EditorBase;
 import org.chromium.chrome.browser.autofill.prefeditor.EditorFieldModel;
 import org.chromium.chrome.browser.autofill.prefeditor.EditorFieldModel.EditorFieldValidator;
 import org.chromium.chrome.browser.autofill.prefeditor.EditorModel;
-import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge;
-import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge.AddressField;
-import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge.AddressUiComponent;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.settings.autofill.AutofillProfileBridge;
+import org.chromium.chrome.browser.settings.autofill.AutofillProfileBridge.AddressField;
+import org.chromium.chrome.browser.settings.autofill.AutofillProfileBridge.AddressUiComponent;
 import org.chromium.payments.mojom.AddressErrors;
 
 import java.lang.annotation.Retention;

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java

@@ -17,8 +17,8 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.autofill.prefeditor.EditableOption;
-import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge;
-import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge.AddressField;
+import org.chromium.chrome.browser.settings.autofill.AutofillProfileBridge;
+import org.chromium.chrome.browser.settings.autofill.AutofillProfileBridge.AddressField;
 import org.chromium.payments.mojom.PaymentAddress;
 
 import java.lang.annotation.Retention;

chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java

@@ -28,8 +28,8 @@ import org.chromium.chrome.browser.autofill.prefeditor.EditorFieldModel;
 import org.chromium.chrome.browser.autofill.prefeditor.EditorFieldModel.EditorFieldValidator;
 import org.chromium.chrome.browser.autofill.prefeditor.EditorFieldModel.EditorValueIconGenerator;
 import org.chromium.chrome.browser.autofill.prefeditor.EditorModel;
-import org.chromium.chrome.browser.autofill.settings.AutofillProfileBridge.DropdownKeyValue;
 import org.chromium.chrome.browser.payments.PaymentRequestImpl.PaymentRequestServiceObserverForTest;
+import org.chromium.chrome.browser.settings.autofill.AutofillProfileBridge.DropdownKeyValue;
 import org.chromium.components.payments.MethodStrings;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentMethodData;

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

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AndroidPaymentAppsFragment.java → chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AndroidPaymentAppsFragment.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.content.Context;
 import android.graphics.Bitmap;

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillCreditCardEditor.java → chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillCreditCardEditor.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -29,8 +29,8 @@ abstract class AutofillCreditCardEditor extends AutofillEditorBase {
     protected int mInitialBillingAddressPos;
 
     @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
         View v = super.onCreateView(inflater, container, savedInstanceState);
 
         // Do not use autofill for the fields.

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

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillEditorBase.java → chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillEditorBase.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -49,8 +49,8 @@ public abstract class AutofillEditorBase
     protected Context mContext;
 
     @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         setHasOptionsMenu(true);
         mContext = container.getContext();
@@ -129,21 +129,21 @@ public abstract class AutofillEditorBase
     protected void initializeButtons(View layout) {
         Button button = (Button) layout.findViewById(R.id.button_secondary);
         button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                getActivity().finish();
-            }
-        });
+                @Override
+                public void onClick(View v) {
+                    getActivity().finish();
+                }
+            });
 
         button = (Button) layout.findViewById(R.id.button_primary);
         button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (saveEntry()) {
-                    getActivity().finish();
+                @Override
+                public void onClick(View v) {
+                    if (saveEntry()) {
+                        getActivity().finish();
+                    }
                 }
-            }
-        });
+            });
         button.setEnabled(false);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditor.java → chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillLocalCardEditor.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.os.Bundle;
 import android.text.Editable;
@@ -49,8 +49,8 @@ public class AutofillLocalCardEditor extends AutofillCreditCardEditor {
     public AutofillLocalCardEditor() {}
 
     @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
         // Allow screenshots of the credit card number in Canary, Dev, and developer builds.
         if (ChromeVersionInfo.isBetaBuild() || ChromeVersionInfo.isStableBuild()) {
             WindowManager.LayoutParams attributes = getActivity().getWindow().getAttributes();
@@ -84,8 +84,8 @@ public class AutofillLocalCardEditor extends AutofillCreditCardEditor {
 
     @Override
     protected int getTitleResourceId(boolean isNewEntry) {
-        return isNewEntry ? R.string.autofill_create_credit_card
-                          : R.string.autofill_edit_credit_card;
+        return isNewEntry
+                ? R.string.autofill_create_credit_card : R.string.autofill_edit_credit_card;
     }
 
     @Override
@@ -103,8 +103,8 @@ public class AutofillLocalCardEditor extends AutofillCreditCardEditor {
     }
 
     void addSpinnerAdapters() {
-        ArrayAdapter<CharSequence> adapter =
-                new ArrayAdapter<CharSequence>(getActivity(), android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(getActivity(),
+                android.R.layout.simple_spinner_item);
 
         // Populate the month dropdown.
         Calendar calendar = Calendar.getInstance();
@@ -119,8 +119,8 @@ public class AutofillLocalCardEditor extends AutofillCreditCardEditor {
         mExpirationMonth.setAdapter(adapter);
 
         // Populate the year dropdown.
-        adapter =
-                new ArrayAdapter<CharSequence>(getActivity(), android.R.layout.simple_spinner_item);
+        adapter = new ArrayAdapter<CharSequence>(getActivity(),
+                android.R.layout.simple_spinner_item);
         int initialYear = calendar.get(Calendar.YEAR);
         for (int year = initialYear; year < initialYear + 10; year++) {
             adapter.add(Integer.toString(year));
@@ -181,8 +181,8 @@ public class AutofillLocalCardEditor extends AutofillCreditCardEditor {
         // Issuer network will be empty if credit card number is not valid.
         if (TextUtils.isEmpty(personalDataManager.getBasicCardIssuerNetwork(
                     cardNumber, true /* emptyIfInvalid */))) {
-            mNumberLabel.setError(
-                    mContext.getString(R.string.payments_card_number_invalid_validation_message));
+            mNumberLabel.setError(mContext.getString(
+                    R.string.payments_card_number_invalid_validation_message));
             return false;
         }
         CreditCard card = personalDataManager.getCreditCardForNumber(cardNumber);

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragment.java → chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillPaymentMethodsFragment.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.content.Context;
 import android.graphics.PorterDuff;

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfileBridge.java → chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfileBridge.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.app.Activity;
 import android.support.v4.app.Fragment;

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

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragment.java → chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragment.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.content.Context;
 import android.graphics.PorterDuff;

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillServerCardEditor.java → chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerCardEditor.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -31,8 +31,8 @@ public class AutofillServerCardEditor extends AutofillCreditCardEditor {
     public AutofillServerCardEditor() {}
 
     @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
         final View v = super.onCreateView(inflater, container, savedInstanceState);
         if (mCard == null) {
             getActivity().finish();
@@ -40,8 +40,8 @@ public class AutofillServerCardEditor extends AutofillCreditCardEditor {
         }
 
         ((TextView) v.findViewById(R.id.title)).setText(mCard.getObfuscatedNumber());
-        ((TextView) v.findViewById(R.id.summary))
-                .setText(mCard.getFormattedExpirationDate(getActivity()));
+        ((TextView) v.findViewById(R.id.summary)).setText(mCard.getFormattedExpirationDate(
+                getActivity()));
         v.findViewById(R.id.edit_server_card).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -50,6 +50,7 @@ public class AutofillServerCardEditor extends AutofillCreditCardEditor {
             }
         });
 
+
         mLocalCopyLabel = v.findViewById(R.id.local_copy_label);
         mClearLocalCopy = v.findViewById(R.id.clear_local_copy);
 

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

chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/CreditCardNumberFormattingTextWatcher.java → chrome/android/java/src/org/chromium/chrome/browser/settings/autofill/CreditCardNumberFormattingTextWatcher.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.text.Editable;
 import android.text.TextUtils;
@@ -110,7 +110,8 @@ public class CreditCardNumberFormattingTextWatcher implements TextWatcher {
         }
     }
 
-    public static boolean hasDashOrSpace(final CharSequence s, final int start, final int count) {
+    public static boolean hasDashOrSpace(final CharSequence s, final int start,
+            final int count) {
         return TextUtils.indexOf(s, " ", start, start + count) != -1
                 || TextUtils.indexOf(s, "-", start, start + count) != -1;
     }

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillProfilesFragmentTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragmentTest.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
@@ -123,8 +123,8 @@ public class AutofillProfilesFragmentTest {
         Assert.assertNotNull(addProfile);
 
         // Try to add an incomplete profile.
-        updatePreferencesAndWait(autofillProfileFragment, addProfile, new String[] {"Mike Doe"},
-                R.id.editor_dialog_done_button, true);
+        updatePreferencesAndWait(autofillProfileFragment, addProfile,
+                new String[] {"Mike Doe"}, R.id.editor_dialog_done_button, true);
         activity.finish();
     }
 
@@ -148,8 +148,8 @@ public class AutofillProfilesFragmentTest {
         Assert.assertEquals("Seb Doe", sebProfile.getTitle());
 
         // Delete a profile.
-        updatePreferencesAndWait(
-                autofillProfileFragment, sebProfile, null, R.id.delete_menu_id, false);
+        updatePreferencesAndWait(autofillProfileFragment, sebProfile, null,
+                R.id.delete_menu_id, false);
 
         Assert.assertEquals(5 /* One toggle + one add button + three profile. */,
                 autofillProfileFragment.getPreferenceScreen().getPreferenceCount());
@@ -226,8 +226,8 @@ public class AutofillProfilesFragmentTest {
         Assert.assertEquals("Bob Doe", bobProfile.getTitle());
 
         // Open the profile.
-        updatePreferencesAndWait(
-                autofillProfileFragment, bobProfile, null, R.id.editor_dialog_done_button, false);
+        updatePreferencesAndWait(autofillProfileFragment, bobProfile, null,
+                R.id.editor_dialog_done_button, false);
 
         Assert.assertEquals(6 /* One toggle + one add button + four profiles. */,
                 autofillProfileFragment.getPreferenceScreen().getPreferenceCount());
@@ -254,8 +254,8 @@ public class AutofillProfilesFragmentTest {
         Assert.assertEquals("Bill Doe", billProfile.getTitle());
 
         // Open the profile.
-        updatePreferencesAndWait(
-                autofillProfileFragment, billProfile, null, R.id.editor_dialog_done_button, false);
+        updatePreferencesAndWait(autofillProfileFragment, billProfile, null,
+                R.id.editor_dialog_done_button, false);
 
         // Check if the preferences are updated correctly.
         Assert.assertEquals(6 /* One toggle + one add button + four profiles. */,
@@ -310,7 +310,7 @@ public class AutofillProfilesFragmentTest {
                     public boolean isSatisfied() {
                         return keyboardVisible
                                 == KeyboardVisibilityDelegate.getInstance().isKeyboardShowing(
-                                        activity, activity.findViewById(android.R.id.content));
+                                           activity, activity.findViewById(android.R.id.content));
                     }
                 });
     }

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillTestRule.java → chrome/android/javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillTestRule.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.autofill.settings;
+package org.chromium.chrome.browser.settings.autofill;
 
 import android.view.KeyEvent;
 import android.widget.EditText;