Split the footer in ClearBrowsingDataPreferences into two paragraphs

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
index 2b83f9a2d1f2ce6f76aa48fd35ce776e60182594..bf7e7c496392a8d23d90d8289526c6bc44dc67a2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
@@ -8,6 +8,8 @@ import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.text.SpannableString;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.browser.ChromeActivity;
@@ -18,6 +20,7 @@ import org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataPreferen
 import org.chromium.chrome.browser.webapps.WebappDataStorage;
 import org.chromium.chrome.browser.webapps.WebappRegistry;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
@@ -40,6 +43,7 @@ public class ClearBrowsingDataPreferencesTest
 
     @Override
     public void startMainActivity() throws InterruptedException {
+        SigninTestUtil.setUpAuthForTest(getInstrumentation());
         startMainActivityOnBlankPage();
     }
 
@@ -246,6 +250,68 @@ public class ClearBrowsingDataPreferencesTest
         });
     }
 
+    /**
+     * Tests that for users who are not signed in, only the general footnote is shown.
+     */
+    @SmallTest
+    public void testFooterNonsigned() throws Exception {
+        SigninTestUtil.get().resetSigninState();
+
+        final Preferences preferences =
+                startPreferences(ClearBrowsingDataPreferences.class.getName());
+
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                ClearBrowsingDataPreferences fragment =
+                        (ClearBrowsingDataPreferences) preferences.getFragmentForTest();
+                PreferenceScreen screen = fragment.getPreferenceScreen();
+
+                assertNotNull(
+                        screen.findPreference(ClearBrowsingDataPreferences.PREF_GENERAL_SUMMARY));
+                assertNull(
+                        screen.findPreference(ClearBrowsingDataPreferences.PREF_GOOGLE_SUMMARY));
+            }
+        });
+    }
+
+    /**
+     * Tests that for users who are signed in, both the general and the Google-specific footnotes
+     * are shown.
+     */
+    @MediumTest
+    public void testFooterSigned() throws Exception {
+        // Sign in.
+        SigninTestUtil.get().addAndSignInTestAccount();
+
+        final Preferences preferences =
+                startPreferences(ClearBrowsingDataPreferences.class.getName());
+
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                ClearBrowsingDataPreferences fragment =
+                        (ClearBrowsingDataPreferences) preferences.getFragmentForTest();
+                PreferenceScreen screen = fragment.getPreferenceScreen();
+
+                assertNotNull(
+                        screen.findPreference(ClearBrowsingDataPreferences.PREF_GENERAL_SUMMARY));
+
+                Preference google_summary =
+                        screen.findPreference(ClearBrowsingDataPreferences.PREF_GOOGLE_SUMMARY);
+                assertNotNull(google_summary);
+
+                // There is currently no clickable link in the Google-specific summary.
+                assertFalse(google_summary.getSummary().getClass() == SpannableString.class);

[newt (away), 2016/04/02 01:24:03]

use instanceof, which is safer since it'll also catch subclasses

    assertFalse(google_summary.getSummary() instanceof SpannableString);

Note that this check is inherently dangerous though, since a TextView's text
could be a SpannableString for many reasons (e.g. it *previously* contained
spans). It might be safer to cast to SpannableString and call getSpans()

[msramek, 2016/04/04 16:23:12]

Done.

+
+                // When the web history service reports that there are other forms of browsing
+                // history, we should show a link to them.
+                fragment.showNoticeAboutOtherFormsOfBrowsingHistory();
+                assertEquals(SpannableString.class, google_summary.getSummary().getClass());
+            }
+        });
+    }
+
     private void setDataTypesToClear(final List<DialogOption> typesToClear) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override