Refactor site_settings_page to use camelCase identifiers

As per Polymer style guide identifiers should be camelCase, this CL
changes site_settings_page to conform to style.

Additionally the mis-naming which caused the associated bug is fixed.

Bug: 1049082
Change-Id: I2c57d987c70e6587cc98f7b3749f6c948d3ffb3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2037675Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Theodore Olsauskas-Warren <sauski@google.com>
Cr-Commit-Position: refs/heads/master@{#738650}

chrome/browser/resources/settings/site_settings_page/site_settings_page.html

@@ -28,7 +28,7 @@
     <div class="settings-box first line-only">
       <h2 class="first">$i18n{siteSettingsAllSites}</h2>
     </div>
-    <cr-link-row data-route="SITE_SETTINGS_ALL" id="all-sites"
+    <cr-link-row data-route="SITE_SETTINGS_ALL" id="allSites"
         label="$i18n{siteSettingsAllSitesDescription}"
         on-click="onTapNavigate_"
         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
@@ -139,7 +139,7 @@
     </template>
 
     <cr-link-row class="hr two-line" data-route="SITE_SETTINGS_BACKGROUND_SYNC"
-        id="background-sync" label="$i18n{siteSettingsBackgroundSync}"
+        id="backgroundSync" label="$i18n{siteSettingsBackgroundSync}"
         on-click="onTapNavigate_" start-icon="cr:sync"
         sub-label="[[defaultSettingLabel_(
             default_.backgroundSync,
@@ -157,7 +157,7 @@
         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
 
     <cr-link-row class="hr two-line"
-        data-route="SITE_SETTINGS_AUTOMATIC_DOWNLOADS" id="automatic-downloads"
+        data-route="SITE_SETTINGS_AUTOMATIC_DOWNLOADS" id="automaticDownloads"
         label="$i18n{siteSettingsAutomaticDownloads}" on-click="onTapNavigate_"
         start-icon="cr:file-download"
         sub-label="[[defaultSettingLabel_(
@@ -167,7 +167,7 @@
         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
 
     <cr-link-row class="hr two-line"
-        data-route="SITE_SETTINGS_UNSANDBOXED_PLUGINS" id="unsandboxed-plugins"
+        data-route="SITE_SETTINGS_UNSANDBOXED_PLUGINS" id="unsandboxedPlugins"
         label="$i18n{siteSettingsUnsandboxedPlugins}" on-click="onTapNavigate_"
         start-icon="cr:extension"
         sub-label="[[defaultSettingLabel_(
@@ -179,7 +179,7 @@
 
     <template is="dom-if" if="[[!isGuest_]]">
       <cr-link-row class="hr two-line" data-route="SITE_SETTINGS_HANDLERS"
-          id="protocol-handlers" label="$i18n{siteSettingsHandlers}"
+          id="protocolHandlers" label="$i18n{siteSettingsHandlers}"
           on-click="onTapNavigate_" start-icon="settings:protocol-handler"
           sub-label="[[defaultSettingLabel_(
               default_.registerProtocolHandler,
@@ -189,7 +189,7 @@
     </template>
 
     <cr-link-row class="hr two-line" data-route="SITE_SETTINGS_MIDI_DEVICES"
-        id="midi-devices" label="$i18n{siteSettingsMidiDevices}"
+        id="midiDevices" label="$i18n{siteSettingsMidiDevices}"
         on-click="onTapNavigate_" start-icon="settings:midi"
         sub-label="[[defaultSettingLabel_(
             default_.midiSysex,
@@ -198,12 +198,12 @@
         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
 
     <cr-link-row class="hr" data-route="SITE_SETTINGS_ZOOM_LEVELS"
-        id="zoom-levels" label="$i18n{siteSettingsZoomLevels}"
+        id="zoomLevels" label="$i18n{siteSettingsZoomLevels}"
         on-click="onTapNavigate_" start-icon="settings:zoom-in"
         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
 
     <cr-link-row class="hr two-line" data-route="SITE_SETTINGS_USB_DEVICES"
-        id="usb-devices" label="$i18n{siteSettingsUsbDevices}"
+        id="usbDevices" label="$i18n{siteSettingsUsbDevices}"
         on-click="onTapNavigate_" start-icon="settings:usb"
         sub-label="[[defaultSettingLabel_(
             default_.usbDevices,
@@ -214,7 +214,7 @@
     <cr-link-row
         class="hr two-line"
         data-route="SITE_SETTINGS_SERIAL_PORTS"
-        id="serial-ports"
+        id="serialPorts"
         label="$i18n{siteSettingsSerialPorts}"
         on-click="onTapNavigate_"
         start-icon="settings:serial-port"
@@ -228,7 +228,7 @@
     <template is="dom-if" if="[[enableNativeFileSystemWriteContentSetting_]]">
       <cr-link-row class="hr two-line"
           data-route="SITE_SETTINGS_NATIVE_FILE_SYSTEM_WRITE"
-          id="native-file-system-write"
+          id="nativeFileSystemWrite"
           label="$i18n{siteSettingsNativeFileSystemWrite}"
           on-click="onTapNavigate_" start-icon="settings:save-original"
           sub-label="[[defaultSettingLabel_(
@@ -244,7 +244,7 @@
           class="hr two-line"
           data-route="SITE_SETTINGS_HID_DEVICES"
           icon-class="subpage-arrow"
-          id="hid-devices"
+          id="hidDevices"
           label="$i18n{siteSettingsHidDevices}"
           on-click="onTapNavigate_"
           start-icon="settings:hid-device"
@@ -256,12 +256,12 @@
     </template>
 
     <cr-link-row class="hr" data-route="SITE_SETTINGS_PDF_DOCUMENTS"
-        id="pdf-documents" label="$i18n{siteSettingsPdfDocuments}"
+        id="pdfDocuments" label="$i18n{siteSettingsPdfDocuments}"
         on-click="onTapNavigate_" start-icon="settings:pdf"
         role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
 
     <cr-link-row class="hr" data-route="SITE_SETTINGS_PROTECTED_CONTENT"
-        id="protected-content" label="$i18n{siteSettingsProtectedContent}"
+        id="protectedContent" label="$i18n{siteSettingsProtectedContent}"
         on-click="onTapNavigate_" start-icon="settings:protected-content"
         role-description="$i18n{subpageArrowRoleDescription}">
     </cr-link-row>
@@ -290,7 +290,7 @@
 
     <template is="dom-if" if="[[enableInsecureContentContentSetting_]]">
       <cr-link-row class="hr two-line" data-route="SITE_SETTINGS_MIXEDSCRIPT"
-          id="mixedscript" label="$i18n{siteSettingsInsecureContent}"
+          id="mixedScript" label="$i18n{siteSettingsInsecureContent}"
           on-click="onTapNavigate_"
           start-icon="settings:insecure-content"
           sub-label="$i18n{siteSettingsInsecureContentBlock}"
@@ -301,7 +301,7 @@
     <template is="dom-if" if="[[enableExperimentalWebPlatformFeatures_]]">
       <cr-link-row class="hr two-line"
           data-route="SITE_SETTINGS_BLUETOOTH_SCANNING"
-          id="bluetooth-scanning" label="$i18n{siteSettingsBluetoothScanning}"
+          id="bluetoothScanning" label="$i18n{siteSettingsBluetoothScanning}"
           on-click="onTapNavigate_" start-icon="settings:bluetooth-scanning"
           sub-label="[[defaultSettingLabel_(
               default_.bluetoothScanning,

chrome/browser/resources/settings/site_settings_page/site_settings_page.js

@@ -107,29 +107,29 @@ Polymer({
     const R = settings.routes;
     const pairs = [
       [R.SITE_SETTINGS_ADS, 'ads'],
-      [R.SITE_SETTINGS_ALL, 'all-sites'],
-      [R.SITE_SETTINGS_AUTOMATIC_DOWNLOADS, 'automatic-downloads'],
-      [R.SITE_SETTINGS_BACKGROUND_SYNC, 'background-sync'],
+      [R.SITE_SETTINGS_ALL, 'allSites'],
+      [R.SITE_SETTINGS_AUTOMATIC_DOWNLOADS, 'automaticDownloads'],
+      [R.SITE_SETTINGS_BACKGROUND_SYNC, 'backgroundSync'],
       [R.SITE_SETTINGS_CAMERA, 'camera'],
       [R.SITE_SETTINGS_CLIPBOARD, 'clipboard'],
       [R.SITE_SETTINGS_COOKIES, 'cookies'],
       [R.SITE_SETTINGS_FLASH, 'flash'],
-      [R.SITE_SETTINGS_HANDLERS, 'protocol-handlers'],
+      [R.SITE_SETTINGS_HANDLERS, 'protocolHandlers'],
       [R.SITE_SETTINGS_IMAGES, 'images'],
       [R.SITE_SETTINGS_JAVASCRIPT, 'javascript'],
       [R.SITE_SETTINGS_LOCATION, 'location'],
       [R.SITE_SETTINGS_MICROPHONE, 'microphone'],
-      [R.SITE_SETTINGS_MIDI_DEVICES, 'midi-devices'],
+      [R.SITE_SETTINGS_MIDI_DEVICES, 'midiDevices'],
       [R.SITE_SETTINGS_NOTIFICATIONS, 'notifications'],
-      [R.SITE_SETTINGS_PDF_DOCUMENTS, 'pdf-documents'],
+      [R.SITE_SETTINGS_PDF_DOCUMENTS, 'pdfDocuments'],
       [R.SITE_SETTINGS_POPUPS, 'popups'],
-      [R.SITE_SETTINGS_PROTECTED_CONTENT, 'protected-content'],
+      [R.SITE_SETTINGS_PROTECTED_CONTENT, 'protectedContent'],
       [R.SITE_SETTINGS_SENSORS, 'sensors'],
-      [R.SITE_SETTINGS_SERIAL_PORTS, 'serial-ports'],
+      [R.SITE_SETTINGS_SERIAL_PORTS, 'serialPorts'],
       [R.SITE_SETTINGS_SOUND, 'sound'],
-      [R.SITE_SETTINGS_UNSANDBOXED_PLUGINS, 'unsandboxed-plugins'],
-      [R.SITE_SETTINGS_USB_DEVICES, 'usb-devices'],
-      [R.SITE_SETTINGS_ZOOM_LEVELS, 'zoom-levels'],
+      [R.SITE_SETTINGS_UNSANDBOXED_PLUGINS, 'unsandboxedPlugins'],
+      [R.SITE_SETTINGS_USB_DEVICES, 'usbDevices'],
+      [R.SITE_SETTINGS_ZOOM_LEVELS, 'zoomLevels'],
     ];
 
     if (this.enablePaymentHandlerContentSetting_) {
@@ -137,18 +137,17 @@ Polymer({
     }
 
     if (this.enableExperimentalWebPlatformFeatures_) {
-      pairs.push([R.SITE_SETTINGS_BLUETOOTH_SCANNING, 'bluetooth-scanning']);
-      pairs.push([R.SITE_SETTINGS_HID_DEVICES, 'hid-devices']);
+      pairs.push([R.SITE_SETTINGS_BLUETOOTH_SCANNING, 'bluetoothScanning']);
+      pairs.push([R.SITE_SETTINGS_HID_DEVICES, 'hidDevices']);
     }
 
     if (this.enableNativeFileSystemWriteContentSetting_) {
-      pairs.push([
-        R.SITE_SETTINGS_NATIVE_FILE_SYSTEM_WRITE, 'native-file-system-write'
-      ]);
+      pairs.push(
+          [R.SITE_SETTINGS_NATIVE_FILE_SYSTEM_WRITE, 'nativeFileSystemWrite']);
     }
 
     if (this.enableInsecureContentContentSetting_) {
-      pairs.push([R.SITE_SETTINGS_MIXEDSCRIPT, 'mixed-script']);
+      pairs.push([R.SITE_SETTINGS_MIXEDSCRIPT, 'mixedScript']);
     }
 
     if (this.enableWebXrContentSetting_) {

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

@@ -25,7 +25,7 @@ cr.define('settings_site_settings_page', function() {
       });
 
       test('LogAllSiteSettingsPageClicks', async function() {
-        page.$$('#all-sites').click();
+        page.$$('#allSites').click();
         let result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -136,7 +136,7 @@ cr.define('settings_site_settings_page', function() {
         settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
         testBrowserProxy.reset();
 
-        page.$$('#background-sync').click();
+        page.$$('#backgroundSync').click();
         result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -170,7 +170,7 @@ cr.define('settings_site_settings_page', function() {
         settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
         testBrowserProxy.reset();
 
-        page.$$('#automatic-downloads').click();
+        page.$$('#automaticDownloads').click();
         result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -181,7 +181,7 @@ cr.define('settings_site_settings_page', function() {
         settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
         testBrowserProxy.reset();
 
-        page.$$('#unsandboxed-plugins').click();
+        page.$$('#unsandboxedPlugins').click();
         result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -194,7 +194,7 @@ cr.define('settings_site_settings_page', function() {
               settings.routes.SITE_SETTINGS);
           testBrowserProxy.reset();
 
-          page.$$('#protocol-handlers').click();
+          page.$$('#protocolHandlers').click();
           result =
               await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
           assertEquals(
@@ -205,7 +205,7 @@ cr.define('settings_site_settings_page', function() {
         settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
         testBrowserProxy.reset();
 
-        page.$$('#midi-devices').click();
+        page.$$('#midiDevices').click();
         result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -216,7 +216,7 @@ cr.define('settings_site_settings_page', function() {
         settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
         testBrowserProxy.reset();
 
-        page.$$('#zoom-levels').click();
+        page.$$('#zoomLevels').click();
         result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -226,7 +226,7 @@ cr.define('settings_site_settings_page', function() {
         settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
         testBrowserProxy.reset();
 
-        page.$$('#usb-devices').click();
+        page.$$('#usbDevices').click();
         result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -236,7 +236,7 @@ cr.define('settings_site_settings_page', function() {
         settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
         testBrowserProxy.reset();
 
-        page.$$('#serial-ports').click();
+        page.$$('#serialPorts').click();
         result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -250,7 +250,7 @@ cr.define('settings_site_settings_page', function() {
               settings.routes.SITE_SETTINGS);
           testBrowserProxy.reset();
 
-          page.$$('#native-file-system-write').click();
+          page.$$('#nativeFileSystemWrite').click();
           result =
               await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
           assertEquals(
@@ -262,7 +262,7 @@ cr.define('settings_site_settings_page', function() {
         settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
         testBrowserProxy.reset();
 
-        page.$$('#pdf-documents').click();
+        page.$$('#pdfDocuments').click();
         result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -273,7 +273,7 @@ cr.define('settings_site_settings_page', function() {
         settings.Router.getInstance().navigateTo(settings.routes.SITE_SETTINGS);
         testBrowserProxy.reset();
 
-        page.$$('#protected-content').click();
+        page.$$('#protectedContent').click();
         result =
             await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
         assertEquals(
@@ -310,7 +310,7 @@ cr.define('settings_site_settings_page', function() {
               settings.routes.SITE_SETTINGS);
           testBrowserProxy.reset();
 
-          page.$$('#mixedscript').click();
+          page.$$('#mixedScript').click();
           result =
               await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
           assertEquals(
@@ -324,7 +324,7 @@ cr.define('settings_site_settings_page', function() {
               settings.routes.SITE_SETTINGS);
           testBrowserProxy.reset();
 
-          page.$$('#bluetooth-scanning').click();
+          page.$$('#bluetoothScanning').click();
           result =
               await testBrowserProxy.whenCalled('recordSettingsPageHistogram');
           assertEquals(
@@ -363,4 +363,4 @@ cr.define('settings_site_settings_page', function() {
   return {
     registerUMALoggingTests,
   };
-});
+});
\ No newline at end of file