Fix divider after switch on Save Passwords screen.

chrome/android/java/src/org/chromium/chrome/browser/preferences/password/ManageSavedPasswordsPreferences.java

 // Copyright 2014 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.password;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
@@ skipping 254 matching lines @@
         getPreferenceScreen().addPreference(mSavePasswordsSwitch);
 
         // Note: setting the switch state before the preference is added to the screen results in
         // some odd behavior where the switch state doesn't always match the internal enabled state
         // (e.g. the switch will say "On" when save passwords is really turned off), so
         // .setChecked() should be called after .addPreference()
         mSavePasswordsSwitch.setChecked(isEnabled);
     }
 
     private void displayManageAccountLink() {
-        if (PasswordUIView.shouldDisplayManageAccountLink()
+        boolean shouldDisplayLink = PasswordUIView.shouldDisplayManageAccountLink();
+        if (shouldDisplayLink
                 && getPreferenceScreen().findPreference(PREF_MANAGE_ACCOUNT_LINK) == null) {
             if (mLinkPref == null) {
                 ForegroundColorSpan colorSpan = new ForegroundColorSpan(
                         getResources().getColor(R.color.pref_accent_color));
                 SpannableString title = SpanApplier.applySpans(
                         getString(R.string.manage_passwords_text),
                         new SpanApplier.SpanInfo("<link>", "</link>", colorSpan));
                 mLinkPref = new ChromeBasePreference(getActivity());
                 mLinkPref.setKey(PREF_MANAGE_ACCOUNT_LINK);
                 mLinkPref.setTitle(title);
                 mLinkPref.setOnPreferenceClickListener(this);
                 mLinkPref.setOrder(ORDER_MANAGE_ACCOUNT_LINK);
             }
             getPreferenceScreen().addPreference(mLinkPref);
-        } else {
-            // Draw a divider only if the preference after mSavePasswordsSwitch is not selectable,
-            // in which case the ListView itself doesn't draw a divider.
-            mSavePasswordsSwitch.setDrawDivider(true);
         }
+        // Draw a divider only if the preference after mSavePasswordsSwitch is not selectable,
+        // in which case the ListView itself doesn't draw a divider.
+        mSavePasswordsSwitch.setDrawDivider(!shouldDisplayLink);
     }
 }