Surface sync error icon if sync is off may be unintentional

chrome/android/java/src/org/chromium/chrome/browser/preferences/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;
 
 import android.accounts.Account;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
@@ skipping 17 matching lines @@
         super(context, attrs);
         updateSyncSummaryAndIcon();
     }
 
     /**
      * Updates the summary and icon for this preference to reflect the current state of syncing.
      */
     public void updateSyncSummaryAndIcon() {
         setSummary(getSyncStatusSummary(getContext()));
 
-        if (ProfileSyncService.get().getAuthError() == GoogleServiceAuthError.State.NONE) {
+        if (SyncPreference.showSyncErrorIcon(getContext())) {
+            setIcon(ApiCompatibilityUtils.getDrawable(
+                    getContext().getResources(), R.drawable.sync_error));
+        } else {
             // Sets preference icon and tints it to blue.
             Drawable icon = ApiCompatibilityUtils.getDrawable(
                     getContext().getResources(), R.drawable.permission_background_sync);
             icon.setColorFilter(ApiCompatibilityUtils.getColor(
                                         getContext().getResources(), R.color.light_active_color),
                     PorterDuff.Mode.SRC_IN);
             setIcon(icon);
-        } else {
-            setIcon(ApiCompatibilityUtils.getDrawable(
-                    getContext().getResources(), R.drawable.sync_error));
         }
     }
 
+    /**
+     * Checks if sync error icon should be shown. Show sync error icon if sync is off because
+     * of error, passphrase required or disabled in Android.
+     */
+    public static boolean showSyncErrorIcon(Context context) {
+        if (!AndroidSyncSettings.isMasterSyncEnabled(context)) {
+            return true;
+        }
+
+        ProfileSyncService profileSyncService = ProfileSyncService.get();
+        if (profileSyncService != null) {
+            if (profileSyncService.hasUnrecoverableError()) {
+                return true;
+            }
+
+            if (profileSyncService.getAuthError() != GoogleServiceAuthError.State.NONE) {
+                return true;
+            }
+
+            if (profileSyncService.isSyncActive()
+                    && profileSyncService.isPassphraseRequiredForDecryption()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private static String getSyncStatusSummary(Context context) {
         if (!ChromeSigninController.get(context).isSignedIn()) return "";
 
         ProfileSyncService profileSyncService = ProfileSyncService.get();
         Resources res = context.getResources();
 
         if (ChildAccountService.isChildAccount()) {
             return res.getString(R.string.kids_account);
         }
 
@@ skipping 24 matching lines @@
             }
 
             Account account = ChromeSigninController.get(context).getSignedInUser();
             return String.format(
                     context.getString(R.string.account_management_sync_summary), account.name);
         }
 
         return context.getString(R.string.sync_is_disabled);
     }
 }