Site Settings Android: Move Autoplay and Protected Content to Media menu.

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java
index e01891b5da42f39983f946ac560e127f3cb3e223..7e693a000d424c46a3cd52f677b1e5941f3b2bf0 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java
@@ -131,6 +131,15 @@ public class SiteSettingsPreferencesTest extends ChromeActivityTestCaseBase<Chro
         assertTrue(getInfoBars().isEmpty());
     }
 
+    private Preferences startSiteSettingsMenu(String category) {
+        Bundle fragmentArgs = new Bundle();
+        fragmentArgs.putString(SingleCategoryPreferences.EXTRA_CATEGORY, category);
+        Intent intent = PreferencesLauncher.createIntentForSettingsPage(
+                getInstrumentation().getTargetContext(), SiteSettingsPreferences.class.getName());
+        intent.putExtra(Preferences.EXTRA_SHOW_FRAGMENT_ARGUMENTS, fragmentArgs);
+        return (Preferences) getInstrumentation().startActivitySync(intent);
+    }
+
     private Preferences startSiteSettingsCategory(String category) {
         Bundle fragmentArgs = new Bundle();
         fragmentArgs.putString(SingleCategoryPreferences.EXTRA_CATEGORY, category);
@@ -457,6 +466,49 @@ public class SiteSettingsPreferencesTest extends ChromeActivityTestCaseBase<Chro
     }
 
     /**
+     * Test that showing the Site Settings menu doesn't crash (crbug.com/610576).
+     * @throws Exception
+     */
+    @SmallTest
+    @Feature({"Preferences"})
+    public void testSiteSettingsMenu() throws Exception {
+        final Preferences preferenceActivity = startSiteSettingsMenu("");
+        preferenceActivity.finish();
+    }
+
+    /**
+     * Test the Media Menu.
+     * @throws Exception
+     */
+    @SmallTest
+    @Feature({"Preferences"})
+    public void testMediaMenu() throws Exception {
+        final Preferences preferenceActivity =
+                startSiteSettingsMenu(SiteSettingsPreferences.MEDIA_KEY);
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                SiteSettingsPreferences siteSettings = (SiteSettingsPreferences)
+                        preferenceActivity.getFragmentForTest();
+
+                SiteSettingsPreference allSites  = (SiteSettingsPreference)
+                        siteSettings.findPreference(SiteSettingsPreferences.ALL_SITES_KEY);
+                assertEquals(null, allSites);
+
+                SiteSettingsPreference autoplay  = (SiteSettingsPreference)
+                        siteSettings.findPreference(SiteSettingsPreferences.AUTOPLAY_KEY);
+                assertFalse(autoplay == null);
+
+                SiteSettingsPreference protectedContent = (SiteSettingsPreference)
+                        siteSettings.findPreference(SiteSettingsPreferences.PROTECTED_CONTENT_KEY);
+                assertFalse(protectedContent == null);
+
+                preferenceActivity.finish();
+            }
+        });
+    }
+
+    /**
      * Tests Reset Site not crashing on host names (issue 600232).
      * @throws Exception
      */