[MD settings] move extra options in category settings

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

 // 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.
 
 /** @fileoverview Runs the Polymer Settings tests. */
 
 /** @const {string} Path to source root. */
 var ROOT_PATH = '../../../../../';
 
 // Polymer BrowserTest fixture.
@@ skipping 633 matching lines @@
 function CrSettingsSiteSettingsTest() {}
 
 CrSettingsSiteSettingsTest.prototype = {
   __proto__: CrSettingsBrowserTest.prototype,
 
   /** @override */
   browsePreload: 'chrome://md-settings/prefs/prefs.html',
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'category_default_setting_tests.js',
+    'category_setting_exceptions_tests.js',
     'site_details_tests.js',
     'site_details_permission_tests.js',
     'site_list_tests.js',
-    'site_settings_category_tests.js',
     'test_browser_proxy.js',
     'test_site_settings_prefs_browser_proxy.js',
     'zoom_levels_tests.js',
     'usb_devices_tests.js',
     'protocol_handlers_tests.js'
   ]),
 };
 
 TEST_F('CrSettingsSiteSettingsTest', 'SiteSettings', function() {
+  category_default_setting.registerTests();
+  category_setting_exceptions.registerTests();
   site_details.registerTests();
   site_details_permission.registerTests();
   site_list.registerTests();
-  site_settings_category.registerTests();
   zoom_levels.registerTests();
   usb_devices.registerTests();
   protocol_handlers.registerTests();
 
   mocha.run();
 });
 
 GEN('#if defined(OS_CHROMEOS)');
 /**
  * Test fixture for device-page.
@@ skipping 478 matching lines @@
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'test_extension_control_browser_proxy.js',
     'extension_controlled_indicator_tests.js',
   ]),
 };
 
 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() {
   mocha.run();
 });