[MD settings] move extra options in category settings

chrome/test/data/webui/settings/category_default_setting_tests.js

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
-/** @fileoverview Suite of tests for site-settings-category. */
-cr.define('site_settings_category', function() {
+/** @fileoverview Suite of tests for category-default-setting. */
+cr.define('category_default_setting', function() {
   function registerTests() {
-    suite('SiteSettingsCategory', function() {
+    suite('CategoryDefaultSetting', function() {
       /**
        * A site settings category created before each test.
        * @type {SiteSettingsCategory}
        */
       var testElement;
 
       /**
        * The mock proxy object to use during test.
        * @type {TestSiteSettingsPrefsBrowserProxy}
        */
@@ skipping 54 matching lines @@
           },
         },
         exceptions: {
           cookies: [],
         },
       };
 
       // Import necessary html before running suite.
       suiteSetup(function() {
         return PolymerTest.importHtml(
-           'chrome://md-settings/site_settings/site_settings_category.html');
+           'chrome://md-settings/site_settings/category_default_setting.html');
       });
 
       // Initialize a site-settings-category before each test.
       setup(function() {
         browserProxy = new TestSiteSettingsPrefsBrowserProxy();
         settings.SiteSettingsPrefsBrowserProxyImpl.instance_ = browserProxy;
         PolymerTest.clearBody();
-        testElement = document.createElement('site-settings-category');
+        testElement = document.createElement('category-default-setting');
+        testElement.subOptionLabel = "test label";
         document.body.appendChild(testElement);
       });
 
       test('getDefaultValueForContentType API used', function() {
         testElement.category = settings.ContentSettingsTypes.GEOLOCATION;
         return browserProxy.whenCalled('getDefaultValueForContentType').then(
             function(contentType) {
               assertEquals(
                   settings.ContentSettingsTypes.GEOLOCATION, contentType);
             });
@@ skipping 77 matching lines @@
       function testTristateCategory(prefs, category, thirdState,
                                     secondaryToggleId) {
         browserProxy.setPrefs(prefs);
 
         testElement.category = category;
         var secondaryToggle = null;
 
         return browserProxy.whenCalled('getDefaultValueForContentType').then(
           function(contentType) {
             Polymer.dom.flush();
-
             secondaryToggle = testElement.$$(secondaryToggleId);
             assertTrue(!!secondaryToggle);
 
             assertEquals(category, contentType);
             assertTrue(testElement.categoryEnabled);
             assertFalse(secondaryToggle.disabled);
             assertTrue(secondaryToggle.checked);
 
             MockInteractions.tap(testElement.$.toggle);
             return browserProxy.whenCalled('setDefaultValueForContentType');
@@ skipping 71 matching lines @@
             assertEquals(thirdState, args[1]);
             assertTrue(testElement.categoryEnabled);
             assertFalse(secondaryToggle.disabled);
             assertTrue(secondaryToggle.checked);
           });
       }
 
       test('test special tri-state Flash category', function() {
         return testTristateCategory(
             prefsFlashDetect, settings.ContentSettingsTypes.PLUGINS,
-            settings.PermissionValues.IMPORTANT_CONTENT, '#flashAskToggle');
+            settings.PermissionValues.IMPORTANT_CONTENT, '#subOptionToggle');
       });
 
       test('test special tri-state Cookies category', function() {
         return testTristateCategory(
             prefsCookesSessionOnly, settings.ContentSettingsTypes.COOKIES,
-            settings.PermissionValues.SESSION_ONLY, '#sessionOnlyToggle');
+            settings.PermissionValues.SESSION_ONLY, '#subOptionToggle');
       });
     });
   }
 
   return {
     registerTests: registerTests,
   };
 });