Adding <keygen> Content Setting (Android UI)

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java

 // Copyright 2015 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.website;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ skipping 105 matching lines @@
 
     private Preferences startSiteSettingsCategory(String category) {
         Bundle fragmentArgs = new Bundle();
         fragmentArgs.putString(SingleCategoryPreferences.EXTRA_CATEGORY, category);
         Intent intent = PreferencesLauncher.createIntentForSettingsPage(
                 getInstrumentation().getTargetContext(), SingleCategoryPreferences.class.getName());
         intent.putExtra(Preferences.EXTRA_SHOW_FRAGMENT_ARGUMENTS, fragmentArgs);
         return (Preferences) getInstrumentation().startActivitySync(intent);
     }
 
+    private Preferences startSingleWebsitePreferences() {
+        Bundle fragmentArgs = SingleWebsitePreferences.createFragmentArgsForSite(
+                TestHttpServerClient.getUrl(""));

[newt (away), 2015/12/15 00:10:01]

Why not use a real page here? Seems like TestHttpServerClient.getUrl("") could
reasonably throw an error or otherwise misbehave; I wouldn't count on
TestHttpServerClient.getUrl("") returning anything meaningful.

[svaldez, 2015/12/15 21:45:57]

Done.

+        Intent intent = PreferencesLauncher.createIntentForSettingsPage(
+                getInstrumentation().getTargetContext(),
+                SingleWebsitePreferences.class.getName());
+        intent.putExtra(Preferences.EXTRA_SHOW_FRAGMENT_ARGUMENTS, fragmentArgs);
+        return (Preferences) getInstrumentation().startActivitySync(intent);
+    }
+
     private void setCookiesEnabled(final Preferences preferenceActivity, final boolean enabled) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 final SingleCategoryPreferences websitePreferences =
                         (SingleCategoryPreferences) preferenceActivity.getFragmentForTest();
                 final ChromeSwitchPreference cookies =
                         (ChromeSwitchPreference) websitePreferences.findPreference(
                                 SingleCategoryPreferences.READ_WRITE_TOGGLE_KEY);
                 final ChromeBaseCheckBoxPreference thirdPartyCookies =
@@ skipping 111 matching lines @@
                     PreferencesTest.clickPreference(languagePreferences, checkbox);
                 }
                 assertEquals("Auto detect encoding should be " + (enabled ? "enabled" : "disabled"),
                         enabled, PrefServiceBridge.getInstance().isAutoDetectEncodingEnabled());
             }
         });
 
         preferenceActivity.finish();
     }
 
+    private void setEnableKeygen(final boolean enabled) {
+        final Preferences preferenceActivity = startSingleWebsitePreferences();
+
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                SingleWebsitePreferences websitePreferences =
+                        (SingleWebsitePreferences) preferenceActivity.getFragmentForTest();
+                ChromeSwitchPreference keygen = (ChromeSwitchPreference)

[newt (away), 2015/12/15 00:10:01]

Doesn't this cast fail? I thought PREF_KEYGEN_PERMISSION was a ListPreference.

[svaldez, 2015/12/15 21:45:57]

Done.

+                        websitePreferences.findPreference(
+                              SingleWebsitePreferences.PREF_KEYGEN_PERMISSION);
+                websitePreferences.onPreferenceChange(keygen, (enabled ? "ALLOW" : "BLOCK"));

[newt (away), 2015/12/15 00:10:01]

I'd simulate clicking the switch, rather than calling
websitePreferences.onPreferenceChange() directly:

  keygen.setValue(enabled ? "ALLOW" : "BLOCK");

That'll better simulate what actually happens when the user clicks on the
ListPreference. (To really simulate it, you'd have to open the list preference
dialog; but I wouldn't worry about that here.)

[svaldez, 2015/12/15 21:45:57]

Done.

+            }
+        });
+        preferenceActivity.finish();
+    }
+
     /**
      * Tests that disabling cookies turns off the third-party cookie toggle.
      * @throws Exception
      */
     @SmallTest
     @Feature({"Preferences"})
     public void testThirdPartyCookieToggleGetsDisabled() throws Exception {
         Preferences preferenceActivity =
                 startSiteSettingsCategory(SiteSettingsPreferences.COOKIES_KEY);
         setCookiesEnabled(preferenceActivity, true);
@@ skipping 77 matching lines @@
         setEnablePopups(true);
 
         // Test that a popup opens.
         loadUrl(TestHttpServerClient.getUrl("chrome/test/data/android/popup.html"));
         getInstrumentation().waitForIdleSync();
 
         assertEquals(2, getTabCount());
     }
 
     /**
+     * Sets Allow Keygen Enabled to be false and make sure it is set correctly.
+     * @throws Exception
+     */
+    @SmallTest
+    @Feature({"Preferences"})
+    public void testKeygenBlocked() throws Exception {

[newt (away), 2015/12/15 00:10:01]

Alternatively, you could just test the Preferences UI here. e.g. Ensure that
changing the keygen preference to "BLOCKED" actually updates the keygen content
setting in C++.

Then, in separate, cross-platform tests, you could test that the <keygen>
element actually respects the stored content settings value.

[svaldez, 2015/12/15 21:45:57]

Done.

+        setEnableKeygen(false);
+
+        loadUrl(TestHttpServerClient.getUrl("chrome/test/data/android/keygen.html"));
+        assertEquals("false", runJavaScriptCodeInCurrentTab("didKeygen();"));
+    }
+
+    /**
+     * Sets Allow Keygen Enabled to be true and make sure it is set correctly.
+     * @throws Exception
+     */
+    @SmallTest
+    @Feature({"Preferences"})
+    public void testKeygenNotBlocked() throws Exception {
+        setEnableKeygen(true);
+
+        loadUrl(TestHttpServerClient.getUrl("chrome/test/data/android/keygen.html"));
+        assertEquals("true", runJavaScriptCodeInCurrentTab("didKeygen();"));
+    }
+
+    /**
      * Sets Allow Camera Enabled to be false and make sure it is set correctly.
      * @throws Exception
      */
     @SmallTest
     @Feature({"Preferences"})
     @CommandLineFlags.Add(ChromeSwitches.USE_FAKE_DEVICE_FOR_MEDIA_STREAM)
     public void testCameraBlocked() throws Exception {
         setEnableCamera(false);
 
         // Test that the camera permission doesn't get requested.
@@ skipping 96 matching lines @@
             public Integer call() throws Exception {
                 if (FeatureUtilities.isDocumentMode(getInstrumentation().getTargetContext())) {
                     return ChromeApplication.getDocumentTabModelSelector().getTotalTabCount();
                 } else {
                     return getActivity().getTabModelSelector().getTotalTabCount();
                 }
             }
         });
     }
 }