Merge 162319 - Fix "Please update your sync passphrase" link on Chrome OS settings.

chrome/browser/resources/options/browser_options.js

Index: chrome/browser/resources/options/browser_options.js
===================================================================
--- chrome/browser/resources/options/browser_options.js	(revision 163470)
+++ chrome/browser/resources/options/browser_options.js	(working copy)
@@ -86,15 +86,6 @@
       // Sync (Sign in) section.
       this.updateSyncState_(loadTimeData.getValue('syncData'));
 
-      $('sync-action-link').onclick = function(event) {
-        if (cr.isChromeOS) {
-          // On Chrome OS, sign out the user and sign in again to get fresh
-          // credentials on auth errors.
-          SyncSetupOverlay.doSignOutOnAuthError();
-        } else {
-          SyncSetupOverlay.showErrorUI();
-        }
-      };
       $('start-stop-sync').onclick = function(event) {
         if (self.syncSetupCompleted)
           SyncSetupOverlay.showStopSyncingUI();
@@ -665,6 +656,18 @@
       $('sync-action-link').hidden = syncData.actionLinkText.length == 0;
       $('sync-action-link').disabled = syncData.managed;
 
+      if (cr.isChromeOS && syncData.hasError) {
+        // On Chrome OS, sign out the user and sign in again to get fresh
+        // credentials on auth errors.
+        $('sync-action-link').onclick = function(event) {
+          SyncSetupOverlay.doSignOutOnAuthError();
+        };
+      } else {
+        $('sync-action-link').onclick = function(event) {
+          SyncSetupOverlay.showErrorUI();
+        };
+      }
+
       if (syncData.hasError)
         $('sync-status').classList.add('sync-error');
       else