| Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
|
| index 7e5abc04cf9d9a1c48a49aa29116a5918b6d543d..849fab8be7e1c2ec76102e9661b5e9157062456a 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
|
| @@ -335,7 +335,7 @@
|
| // We remove the the SyncedAccountPreference if there's only 1 account on the device, so
|
| // it's possible for accountList to be null
|
| if (accountList != null) {
|
| - Account[] accounts = AccountManagerHelper.get().getGoogleAccounts();
|
| + Account[] accounts = AccountManagerHelper.get(getActivity()).getGoogleAccounts();
|
| if (accounts.length <= 1) {
|
| getPreferenceScreen().removePreference(accountList);
|
| } else {
|
| @@ -708,8 +708,9 @@
|
| }
|
|
|
| if (mCurrentSyncError == SYNC_AUTH_ERROR) {
|
| - AccountManagerHelper.get().updateCredentials(
|
| - ChromeSigninController.get().getSignedInUser(), getActivity(), null);
|
| + AccountManagerHelper.get(getActivity())
|
| + .updateCredentials(ChromeSigninController.get(getActivity()).getSignedInUser(),
|
| + getActivity(), null);
|
| return;
|
| }
|
|
|
| @@ -722,7 +723,7 @@
|
| }
|
|
|
| if (mCurrentSyncError == SYNC_OTHER_ERRORS) {
|
| - final Account account = ChromeSigninController.get().getSignedInUser();
|
| + final Account account = ChromeSigninController.get(getActivity()).getSignedInUser();
|
| SigninManager.get(getActivity()).signOut(new Runnable() {
|
| @Override
|
| public void run() {
|
|
|