Redirect users without sync passphrase to passwords.google.com

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
index 35fa0e71c15b74b77cffbb1536342bd020bd8839..1732a7cc679ecebbb2f7389b21c4bbcf25ffbb04 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
@@ -23,9 +23,12 @@ import org.chromium.chrome.browser.preferences.website.WebsitePreferenceBridge;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.LoadListener;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;
+import org.chromium.chrome.browser.sync.FakeProfileSyncService;
+import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.UiUtils;
+import org.chromium.sync.AndroidSyncSettings;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -263,6 +266,40 @@ public class PreferencesTest extends NativeLibraryTestBase {
         assertFontSizePrefs(true, fontSmallerThanThreshold);
     }
 
+    /**
+     * Verifies that syncing users without a custom passphrase are redirected to
+     * passwords.google.com.
+     */
+    @SmallTest
+    @Feature ({"Preferences"})
+    public void testRedirectPasswords() {
+        FakeProfileSyncService syncService =
+                (FakeProfileSyncService) ProfileSyncService.get();
+        syncService.setIsUsingSecondaryPassphrase(false);
+        AndroidSyncSettings.setSyncEnabled(true);
+        SavePasswordsPreferences passwordsPref =
+                (SavePasswordsPreferences) preferences.getFragmentForTest();
+        assertEquals(mPasswordsPref.getKey(), "manage_account_link");
+    }
+
+    /**
+     * Verifies that syncing users without a custom passphrase are redirected to

[vabr (Chromium), 2016/06/27 15:23:44]

The comment says "without" and the code "with" (line 294) custom passphrase.

[dozsa, 2016/06/28 09:53:23]

Sorry, have fixed this in the new version of the test.

+     * passwords.google.com if smart lock branding is not used.
+     */
+    @SmallTest
+    @Feature ({"Preferences"})
+    public void testNativePasswords() {
+        FakeProfileSyncService syncService =
+                (FakeProfileSyncService) ProfileSyncService.get();
+        syncService.setIsUsingSecondaryPassphrase(true);
+        PasswordUIView.setShouldUseSmartLockBranding(false);
+        AndroidSyncSettings.setSyncEnabled(true);
+        SavePasswordsPreferences passwordsPref =
+                (SavePasswordsPreferences) preferences.getFragmentForTest();
+        assertEquals(mPasswordsPref.getTitle(), getResources().getString(
+                R.string.prefs_saved_passwords));
+    }
+
     private void assertFontSizePrefs(final boolean expectedForceEnableZoom,
             final float expectedFontScale) {
         final Context targetContext = getInstrumentation().getTargetContext();