Updates the UI and reenables the fix introduced in commit 256939

chrome/browser/resources/options/browser_options.js

 // Copyright (c) 2012 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.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var RepeatingButton = cr.ui.RepeatingButton;
   var HotwordSearchSettingIndicator = options.HotwordSearchSettingIndicator;
 
@@ skipping 850 matching lines @@
       // See http://crbug.com/268265.
       var customizeSyncButtonNewText = syncData.setupCompleted ?
           loadTimeData.getString('customizeSync') :
           loadTimeData.getString('syncButtonTextStart');
       if (customizeSyncButton.textContent != customizeSyncButtonNewText)
         customizeSyncButton.textContent = customizeSyncButtonNewText;
 
       // Disable the "sign in" button if we're currently signing in, or if we're
       // already signed in and signout is not allowed.
       var signInButton = $('start-stop-sync');
-      signInButton.disabled = syncData.setupInProgress ||
-                              !syncData.signoutAllowed;
+      signInButton.disabled = syncData.setupInProgress;
       this.signoutAllowed_ = syncData.signoutAllowed;
       if (!syncData.signoutAllowed)
         $('start-stop-sync-indicator').setAttribute('controlled-by', 'policy');
       else
         $('start-stop-sync-indicator').removeAttribute('controlled-by');
 
       // Hide the "sign in" button on Chrome OS, and show it on desktop Chrome.
       signInButton.hidden = cr.isChromeOS;
 
       signInButton.textContent =
@@ skipping 909 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });