new file mode 100644
--- /dev/null
+++ b/b2g/dev/app/moz.build
@@ -0,0 +1,3 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.

--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -84,23 +84,26 @@
     <preference id="browser.taskbar.previews.enable"
                 name="browser.taskbar.previews.enable"
                 type="bool"/>
 #endif
 </preferences>
 
 <hbox id="header-general"
       class="header"
+      hidden="true"
       data-category="paneGeneral">
   <image class="header-icon"/>
   <label class="header-name">&paneGeneral.title;</label>
 </hbox>
 
 <!-- Startup -->
-<groupbox id="startupGroup" data-category="paneGeneral">
+<groupbox id="startupGroup"
+          data-category="paneGeneral"
+          hidden="true">
   <caption><label>&startup.label;</label></caption>
 
   <hbox align="center">
     <label accesskey="&startupPage.accesskey;"
            control="browserStartupPage">&startupPage.label;</label>
     <menulist id="browserStartupPage"
               preference="browser.startup.page">
       <menupopup>
@@ -147,17 +150,19 @@
             accesskey="&restoreDefault.accesskey;"
             oncommand="gMainPane.restoreDefaultHomePage();"
             id="restoreDefaultHomePage"
             preference="pref.browser.homepage.disable_button.restore_default"/>
   </hbox>
 </groupbox>
 
 <!-- Downloads -->
-<groupbox id="downloadsGroup" data-category="paneGeneral">
+<groupbox id="downloadsGroup"
+          data-category="paneGeneral"
+          hidden="true">
   <caption><label>&downloads.label;</label></caption>
 
   <radiogroup id="saveWhere"
               preference="browser.download.useDownloadDir"
               onsyncfrompreference="return gMainPane.readUseDownloadDir();">
     <hbox id="saveToRow">
       <radio id="saveTo"
              value="true"
@@ -186,17 +191,18 @@
     <radio id="alwaysAsk"
            value="false"
            label="&alwaysAsk.label;"
            accesskey="&alwaysAsk.accesskey;"/>
   </radiogroup>
 </groupbox>
 
 <!-- Tab preferences -->
-<groupbox data-category="paneGeneral">
+<groupbox data-category="paneGeneral"
+          hidden="true">
     <caption><label>&tabsGroup.label;</label></caption>
     <checkbox id="linkTargeting" label="&newWindowsAsTabs.label;"
               accesskey="&newWindowsAsTabs.accesskey;"
               preference="browser.link.open_newwindow"
               onsyncfrompreference="return gMainPane.readLinkTarget();"
               onsynctopreference="return gMainPane.writeLinkTarget();"/>
 
     <checkbox id="warnCloseMultiple" label="&warnCloseMultipleTabs.label;"

--- a/browser/components/preferences/in-content/preferences.js
+++ b/browser/components/preferences/in-content/preferences.js
@@ -27,16 +27,18 @@ function init_all() {
   gSyncPane.init();
   gSecurityPane.init();
   var initFinished = document.createEvent("Event");
   initFinished.initEvent("Initialized", true, true);
   document.dispatchEvent(initFinished);
 
   let categories = document.getElementById("categories");
   categories.addEventListener("select", event => gotoPref(event.target.value));
+
+  gotoPref("paneGeneral");
 }
 
 function selectCategory(name) {
   let categories = document.getElementById("categories");
   let item = categories.querySelector(".category[value=" + name + "]");
   categories.selectedItem = item;
   gotoPref(name);
 }

--- a/browser/components/translation/translation-infobar.xml
+++ b/browser/components/translation/translation-infobar.xml
@@ -16,69 +16,85 @@
           xmlns:xbl="http://www.mozilla.org/xbl">
   <binding id="translationbar" extends="chrome://global/content/bindings/notification.xml#notification" role="xul:alert">
     <resources>
       <stylesheet src="chrome://global/skin/notification.css"/>
     </resources>
     <content>
       <xul:hbox class="notification-inner outset" flex="1" xbl:inherits="type">
         <xul:hbox anonid="details" align="center" flex="1">
-          <xul:image anonid="messageImage" class="messageImage"/>
+          <xul:image class="translate-infobar-element messageImage"
+                     anonid="messageImage"/>
           <xul:deck anonid="translationStates" selectedIndex="0">
 
             <!-- offer to translate -->
             <xul:hbox class="translate-offer-box" align="center">
-              <xul:label value="&translation.thisPageIsIn.label;"/>
-              <xul:menulist anonid="detectedLanguage">
+              <xul:label class="translate-infobar-element" value="&translation.thisPageIsIn.label;"/>
+              <xul:menulist class="translate-infobar-element" anonid="detectedLanguage">
                 <xul:menupopup/>
               </xul:menulist>
-              <xul:label value="&translation.translateThisPage.label;"/>
-              <xul:button label="&translation.translate.button;" anonid="translate"
+              <xul:label class="translate-infobar-element" value="&translation.translateThisPage.label;"/>
+              <xul:button class="translate-infobar-element"
+                          label="&translation.translate.button;"
+                          anonid="translate"
                           oncommand="document.getBindingParent(this).translate();"/>
-              <xul:button label="&translation.notNow.button;" anonid="notNow"
+              <xul:button class="translate-infobar-element"
+                          label="&translation.notNow.button;" anonid="notNow"
                           oncommand="document.getBindingParent(this).close();"/>
             </xul:hbox>
 
             <!-- translating -->
-            <xul:vbox class="translating-box" pack="center">
-              <xul:label value="&translation.translatingContent.label;"/>
-            </xul:vbox>
+            <xul:hbox class="translating-box" pack="center">
+              <xul:label class="translate-infobar-element"
+                         value="&translation.translatingContent.label;"/>
+            </xul:hbox>
 
             <!-- translated -->
             <xul:hbox class="translated-box" align="center">
-              <xul:label value="&translation.translatedFrom.label;"/>
-              <xul:menulist anonid="fromLanguage"
+              <xul:label class="translate-infobar-element"
+                         value="&translation.translatedFrom.label;"/>
+              <xul:menulist class="translate-infobar-element"
+                            anonid="fromLanguage"
                             oncommand="document.getBindingParent(this).translate()">
                 <xul:menupopup/>
               </xul:menulist>
-              <xul:label value="&translation.translatedTo.label;"/>
+              <xul:label class="translate-infobar-element"
+                         value="&translation.translatedTo.label;"/>
               <xul:menulist anonid="toLanguage"
                             oncommand="document.getBindingParent(this).translate()">
                 <xul:menupopup/>
               </xul:menulist>
               <xul:label value="&translation.translatedToSuffix.label;"/>
               <xul:button anonid="showOriginal"
+                          class="translate-infobar-element"
                           label="&translation.showOriginal.button;"
                           oncommand="document.getBindingParent(this).showOriginal();"/>
               <xul:button anonid="showTranslation"
+                          class="translate-infobar-element"
                           label="&translation.showTranslation.button;"
                           oncommand="document.getBindingParent(this).showTranslation();"/>
             </xul:hbox>
 
             <!-- error -->
             <xul:hbox class="translation-error" align="center">
-              <xul:label value="&translation.errorTranslating.label;"/>
-              <xul:button label="&translation.tryAgain.button;" anonid="tryAgain"
+              <xul:label class="translate-infobar-element"
+                         value="&translation.errorTranslating.label;"/>
+              <xul:button class="translate-infobar-element"
+                          label="&translation.tryAgain.button;"
+                          anonid="tryAgain"
                           oncommand="document.getBindingParent(this).translate();"/>
             </xul:hbox>
 
           </xul:deck>
           <xul:spacer flex="1"/>
 
-          <xul:button type="menu" anonid="options" label="&translation.options.menu;">
+          <xul:button type="menu"
+                      class="translate-infobar-element options-menu-button"
+                      anonid="options"
+                      label="&translation.options.menu;">
             <xul:menupopup onpopupshowing="document.getBindingParent(this).optionsShowing();">
               <xul:menuitem anonid="neverForLanguage"
                             oncommand="document.getBindingParent(this).neverForLanguage();"/>
               <xul:menuitem anonid="neverForSite"
                             oncommand="document.getBindingParent(this).neverForSite();"
                             label="&translation.options.neverForSite.label;"
                             accesskey="&translation.options.neverForSite.accesskey;"/>
               <xul:menuseparator/>

--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -407,17 +407,16 @@
               align="center"
               pack="center">
           <description id="black-boxed-message-label">
             &debuggerUI.blackBoxMessage.label;
           </description>
           <button id="black-boxed-message-button"
                   class="devtools-toolbarbutton"
                   label="&debuggerUI.blackBoxMessage.unBlackBoxButton;"
-                  image="chrome://browser/skin/devtools/debugger-blackbox-eye.png"
                   command="unBlackBoxCommand"/>
         </vbox>
         <vbox id="source-progress-container"
               align="center"
               pack="center">
           <progressmeter id="source-progress"
                          mode="undetermined"/>
         </vbox>

--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -47,16 +47,19 @@
 }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
   padding-top: 1px;
   padding-bottom: 1px;
 }
 
 #TabsToolbar:not([collapsed="true"]) + #nav-bar {
+  border-top: 1px solid hsla(0,0%,0%,.3) !important;
+  background-clip: padding-box;
+  margin-top: -1px; /* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */
   /* Position the toolbar above the bottom of background tabs */
   position: relative;
   z-index: 1;
 }
 
 #nav-bar {
   background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
   box-shadow: 0 1px 0 @toolbarHighlight@ inset;
@@ -1368,36 +1371,53 @@ toolbarbutton[sdk-button="true"][cui-are
 #pointerLock-cancel {
   margin: 0px;
 }
 
 /* Translation infobar */
 
 %include ../shared/translation/infobar.inc.css
 
+notification[value="translation"] {
+  min-height: 40px;
+}
+
 notification[value="translation"],
 notification[value="translation"] button,
 notification[value="translation"] menulist {
+  min-height: 30px;
   color: #5A5959;
 }
 
 notification[value="translation"] {
   background-color: #F2F1F0;
 }
 
+notification[value="translation"] button,
+notification[value="translation"] menulist {
+  -moz-padding-end: 1ch;
+}
+
 notification[value="translation"] menulist {
   border: 1px solid #C1C1C1;
   background-color: #FFF;
 }
 
 notification[value="translation"] button {
   border: 1px solid #C1C1C1;
   background-color: #F2F1F0;
 }
 
+notification[value="translation"] button,
+notification[value="translation"] menulist,
+notification[value="translation"] menulist > .menulist-label-box {
+  -moz-margin-start: 1ch;
+  -moz-margin-end: 1ch;
+}
+
 notification[value="translation"] button:hover,
 notification[value="translation"] button:active,
 notification[value="translation"] menulist:hover,
 notification[value="translation"] menulist:active {
   background-color: #E2E1E0;
 }
 
 notification[value="translation"] button[anonid="translate"] {
@@ -1407,16 +1427,26 @@ notification[value="translation"] button
   border: 1px solid #829C1C;
 }
 
 notification[value="translation"] button[anonid="translate"]:hover,
 notification[value="translation"] button[anonid="translate"]:active {
   background-image: linear-gradient(#8DA726, #8DA726);
 }
 
+notification[value="translation"] button > .button-box,
+notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
+  padding: 0;
+  -moz-margin-start: 3ch;
+}
+
+notification[value="translation"] button:not([type="menu"]) > .button-box {
+  -moz-margin-end: 3ch;
+}
+
 notification[value="translation"] menulist > .menulist-dropmarker {
   display: block;
 }
 
 .translate-notification-icon,
 #translate-notification-icon {
   list-style-image: url(chrome://browser/skin/translation-16.png);
   -moz-image-region: rect(0px, 16px, 16px, 0px);
@@ -1716,33 +1746,19 @@ richlistitem[type~="action"][actiontype=
 #tabbrowser-tabs {
   /* override the global style to allow the selected tab to be above the nav-bar */
   z-index: auto;
 }
 
 #TabsToolbar {
   min-height: 0;
   padding: 0;
-  position: relative;
   margin-bottom: -@tabToolbarNavbarOverlap@;
 }
 
-/*
- * Draw the bottom border of the tabstrip:
- */
-#TabsToolbar::after {
-  content: "";
-  position: absolute;
-  bottom: @tabToolbarNavbarOverlap@;
-  left: 0;
-  right: 0;
-  z-index: 0;
-  border-bottom: 1px solid hsla(0,0%,0%,.3);
-}
-
 #TabsToolbar:not(:-moz-lwtheme) {
   -moz-appearance: menubar;
   color: -moz-menubartext;
 }
 
 #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
 #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");

--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -238,17 +238,18 @@ browser.jar:
 * skin/classic/browser/devtools/shadereditor.css      (devtools/shadereditor.css)
 * skin/classic/browser/devtools/splitview.css         (../shared/devtools/splitview.css)
   skin/classic/browser/devtools/styleeditor.css       (../shared/devtools/styleeditor.css)
 * skin/classic/browser/devtools/webaudioeditor.css    (devtools/webaudioeditor.css)
   skin/classic/browser/devtools/magnifying-glass.png        (../shared/devtools/images/magnifying-glass.png)
   skin/classic/browser/devtools/magnifying-glass@2x.png     (../shared/devtools/images/magnifying-glass@2x.png)
   skin/classic/browser/devtools/magnifying-glass-light.png  (../shared/devtools/images/magnifying-glass-light.png)
   skin/classic/browser/devtools/magnifying-glass-light@2x.png (../shared/devtools/images/magnifying-glass-light@2x.png)
-  skin/classic/browser/devtools/itemToggle.png        (../shared/devtools/images/itemToggle.png)
+  skin/classic/browser/devtools/itemToggle.png         (../shared/devtools/images/itemToggle.png)
+  skin/classic/browser/devtools/itemToggle@2x.png      (../shared/devtools/images/itemToggle@2x.png)
   skin/classic/browser/devtools/itemArrow-dark-rtl.svg (../shared/devtools/images/itemArrow-dark-rtl.svg)
   skin/classic/browser/devtools/itemArrow-dark-ltr.svg (../shared/devtools/images/itemArrow-dark-ltr.svg)
   skin/classic/browser/devtools/itemArrow-rtl.svg      (../shared/devtools/images/itemArrow-rtl.svg)
   skin/classic/browser/devtools/itemArrow-ltr.svg      (../shared/devtools/images/itemArrow-ltr.svg)
   skin/classic/browser/devtools/noise.png             (../shared/devtools/images/noise.png)
   skin/classic/browser/devtools/dropmarker.png        (../shared/devtools/images/dropmarker.png)
   skin/classic/browser/devtools/layoutview.css         (../shared/devtools/layoutview.css)
   skin/classic/browser/devtools/debugger-collapse.png  (../shared/devtools/images/debugger-collapse.png)
@@ -260,17 +261,16 @@ browser.jar:
   skin/classic/browser/devtools/debugger-play.png      (../shared/devtools/images/debugger-play.png)
   skin/classic/browser/devtools/debugger-play@2x.png      (../shared/devtools/images/debugger-play@2x.png)
   skin/classic/browser/devtools/debugger-step-in.png   (../shared/devtools/images/debugger-step-in.png)
   skin/classic/browser/devtools/debugger-step-in@2x.png   (../shared/devtools/images/debugger-step-in@2x.png)
   skin/classic/browser/devtools/debugger-step-out.png  (../shared/devtools/images/debugger-step-out.png)
   skin/classic/browser/devtools/debugger-step-out@2x.png  (../shared/devtools/images/debugger-step-out@2x.png)
   skin/classic/browser/devtools/debugger-step-over.png (../shared/devtools/images/debugger-step-over.png)
   skin/classic/browser/devtools/debugger-step-over@2x.png (../shared/devtools/images/debugger-step-over@2x.png)
-  skin/classic/browser/devtools/debugger-blackbox-eye.png  (../shared/devtools/images/debugger-blackbox-eye.png)
   skin/classic/browser/devtools/debugger-blackbox.png  (../shared/devtools/images/debugger-blackbox.png)
   skin/classic/browser/devtools/debugger-blackbox@2x.png  (../shared/devtools/images/debugger-blackbox@2x.png)
   skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
   skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
   skin/classic/browser/devtools/tracer-icon.png        (../shared/devtools/images/tracer-icon.png)
   skin/classic/browser/devtools/tracer-icon@2x.png     (../shared/devtools/images/tracer-icon@2x.png)
   skin/classic/browser/devtools/responsive-se-resizer.png (../shared/devtools/images/responsive-se-resizer.png)
   skin/classic/browser/devtools/responsive-vertical-resizer.png (../shared/devtools/images/responsive-vertical-resizer.png)

index 63f77f1b760b2e66e2fab7e739979b7cdede2116..0b3c4e4b5f6957c906c13ca2e73d11c523649441
GIT binary patch
literal 143
zc%17D@N?(olHy`uVBq!ia0vp^%s?#1!3HE>CM@{{q{2L1978G?lam~nR?P8#KhMys
z^W!FlOf|I?I?@8hhb-PW^e7!}32kHUm^ssdMWDDTRY0bNN8FKbnOxo)88MA^*42!6
rB;16<j(N^0wlLV!dnWOaY#u|%fA;?F%Pkv#HZXX)`njxgN@xNA95O8C

--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -3611,16 +3611,18 @@ toolbarbutton.chevron > .toolbarbutton-m
 }
 @media (min-resolution: 2dppx) {
   .pointerLock-notification-icon,
   #pointerLock-notification-icon {
     list-style-image: url(chrome://browser/skin/pointerLock-16@2x.png);
   }
 }
 
+/* Translation */
+
 .translate-notification-icon,
 #translate-notification-icon {
   list-style-image: url(chrome://browser/skin/translation-16.png);
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 @media (min-resolution: 2dppx) {
   .translate-notification-icon,
   #translate-notification-icon {
@@ -3637,16 +3639,133 @@ toolbarbutton.chevron > .toolbarbutton-m
 @media (min-resolution: 2dppx) {
   .translated-notification-icon,
   #translated-notification-icon {
     list-style-image: url(chrome://browser/skin/translation-16@2x.png);
     -moz-image-region: rect(0px, 64px, 32px, 32px);
   }
 }
 
+%include ../shared/translation/infobar.inc.css
+
+notification[value="translation"] {
+  color: #484848;
+  background-color: #EFEFEF;
+  background-image: none;
+  border-top: none;
+  border-bottom: 1px solid #c4c4c4;
+  padding-top: 1px;
+  padding-bottom: 1px;
+}
+
+.translate-infobar-element {
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+}
+
+button.translate-infobar-element {
+  background: linear-gradient(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1)) repeat scroll 0% 0% padding-box transparent;
+  color: #333333;
+  border: 1px solid;
+  border-color: rgba(23, 51, 78, 0.15) rgba(23, 51, 78, 0.17) rgba(23, 51, 78, 0.2);
+  box-shadow: 0px 0px 2px rgba(255, 255, 255, 0.5) inset, 0px 1px 0px rgba(255, 255, 255, 0.2);
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 150ms;
+  min-height: 22px;
+  min-width: 0;
+  padding: 0 0.8em !important;
+  margin-left: 0.25em;
+  margin-right: 0.25em;
+}
+
+button.translate-infobar-element .button-text {
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+}
+
+label.translate-infobar-element {
+  padding-top: 2px;
+}
+
+button.translate-infobar-element:hover {
+  background: #f0f0f0;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.1) inset,  0 0 0 1px hsla(0,0%,100%,.05) inset,  0 1px 0 hsla(210,54%,20%,.01),  0 0 4px hsla(206,100%,20%,.1);
+}
+
+button.translate-infobar-element:active {
+  box-shadow: 0 1px 1px hsla(211,79%,6%,.1) inset,  0 0 1px hsla(211,79%,6%,.2) inset;
+  transition-duration: 0ms;
+}
+
+button.translate-infobar-element[anonid="translate"] {
+  color: #ffffff;
+  background-image: linear-gradient(#4cb1ff, #1793e5);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,  0 0 0 1px hsla(0,0%,100%,.1) inset,  0 1px 0 hsla(210,54%,20%,.03);
+  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
+  padding: 0 1.1em  !important;;
+}
+
+button.translate-infobar-element[anonid="translate"]:hover {
+  background-image: linear-gradient(#66bdff, #0d9eff);
+}
+
+button.translate-infobar-element.options-menu-button {
+  -moz-padding-start: 0.5em !important;
+  -moz-padding-end: 0.3em !important;
+}
+
+button.translate-infobar-element.options-menu-button > .button-box > .button-menu-dropmarker {
+  display: -moz-box;
+  list-style-image: url("chrome://browser/skin/toolbarbutton-dropmarker.png");
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
+@media (min-resolution: 1.25dppx) {
+  button.translate-infobar-element.options-menu-button > .button-box > .button-menu-dropmarker {
+    list-style-image: url("chrome://browser/skin/toolbarbutton-dropmarker@2x.png");
+  }
+
+  button.translate-infobar-element.options-menu-button > .button-box > .button-menu-dropmarker > .dropmarker-icon {
+    width: 7px;
+  }
+}
+
+menulist.translate-infobar-element {
+  text-shadow: 0 1px 1px #FEFFFE;
+  border: 1px solid;
+  border-color: rgba(23, 51, 78, 0.15) rgba(23, 51, 78, 0.17) rgba(23, 51, 78, 0.2);
+  box-shadow: 0 1px 1px 0 #FFFFFF, inset 0 2px 2px 0 #FFFFFF;
+  background-color: #F1F1F1;
+  background-image: linear-gradient(#FFFFFF, rgba(255,255,255,0.1));
+  color: #333333;
+  padding: 0;
+}
+
+menulist.translate-infobar-element > .menulist-label-box {
+  padding-top: 1px;
+  -moz-padding-start: 0.3em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+menulist.translate-infobar-element:hover {
+  background-image: linear-gradient(#FFFFFF, rgba(255,255,255,0.6));
+}
+
+menulist.translate-infobar-element[open="true"] {
+  background-image: linear-gradient(rgba(255,255,255,0.1),
+                                    rgba(255,255,255,0.6));
+}
+
+menulist.translate-infobar-element > .menulist-dropmarker {
+  display: -moz-box;
+  list-style-image: url("chrome://global/skin/icons/menulist-dropmarker.png");
+}
+
 
 .popup-notification-icon {
   width: 64px;
   height: 64px;
   -moz-margin-end: 10px;
 }
 
 .popup-notification-icon[popupid="geolocation"] {

--- a/browser/themes/osx/devtools/commandline.css
+++ b/browser/themes/osx/devtools/commandline.css
@@ -7,18 +7,17 @@
   font: message-box;
   color: hsl(210,30%,85%);
 }
 
 #gcli-output-root,
 #gcli-tooltip-root {
   border: 1px solid hsl(206,37%,4%);
   box-shadow: 0 1px 0 hsla(209,29%,72%,.25) inset;
-  background-image: url(background-noise-toolbar.png),
-                    linear-gradient(hsla(209,18%,18%,0.9), hsl(209,23%,18%));
+  background-image: linear-gradient(hsla(209,18%,18%,0.9), hsl(209,23%,18%));
   border-radius: 3px;
 }
 
 #gcli-output-root {
   padding: 5px 10px;
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
   border-bottom: 0;
@@ -31,17 +30,16 @@
 #gcli-tooltip-connector {
   margin-top: -1px;
   margin-left: 8px;
   width: 20px;
   height: 10px;
   border-left: 1px solid hsl(206,37%,4%);
   border-right: 1px solid hsl(206,37%,4%);
   background-color: hsl(209,23%,18%);
-  background-image: url(background-noise-toolbar.png);
 }
 
 .gcli-tt-description,
 .gcli-tt-error {
   padding: 0 10px;
 }
 
 .gcli-row-out {

--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -357,16 +357,17 @@ browser.jar:
 * skin/classic/browser/devtools/splitview.css               (../shared/devtools/splitview.css)
   skin/classic/browser/devtools/styleeditor.css             (../shared/devtools/styleeditor.css)
 * skin/classic/browser/devtools/webaudioeditor.css          (devtools/webaudioeditor.css)
   skin/classic/browser/devtools/magnifying-glass.png        (../shared/devtools/images/magnifying-glass.png)
   skin/classic/browser/devtools/magnifying-glass@2x.png     (../shared/devtools/images/magnifying-glass@2x.png)
   skin/classic/browser/devtools/magnifying-glass-light.png  (../shared/devtools/images/magnifying-glass-light.png)
   skin/classic/browser/devtools/magnifying-glass-light@2x.png (../shared/devtools/images/magnifying-glass-light@2x.png)
   skin/classic/browser/devtools/itemToggle.png              (../shared/devtools/images/itemToggle.png)
+  skin/classic/browser/devtools/itemToggle@2x.png           (../shared/devtools/images/itemToggle@2x.png)
   skin/classic/browser/devtools/itemArrow-dark-rtl.svg      (../shared/devtools/images/itemArrow-dark-rtl.svg)
   skin/classic/browser/devtools/itemArrow-dark-ltr.svg      (../shared/devtools/images/itemArrow-dark-ltr.svg)
   skin/classic/browser/devtools/itemArrow-rtl.svg           (../shared/devtools/images/itemArrow-rtl.svg)
   skin/classic/browser/devtools/itemArrow-ltr.svg           (../shared/devtools/images/itemArrow-ltr.svg)
   skin/classic/browser/devtools/noise.png                   (../shared/devtools/images/noise.png)
   skin/classic/browser/devtools/dropmarker.png              (../shared/devtools/images/dropmarker.png)
   skin/classic/browser/devtools/layoutview.css              (../shared/devtools/layoutview.css)
   skin/classic/browser/devtools/debugger-collapse.png       (../shared/devtools/images/debugger-collapse.png)
@@ -378,17 +379,16 @@ browser.jar:
   skin/classic/browser/devtools/debugger-play.png           (../shared/devtools/images/debugger-play.png)
   skin/classic/browser/devtools/debugger-play@2x.png        (../shared/devtools/images/debugger-play@2x.png)
   skin/classic/browser/devtools/debugger-step-in.png        (../shared/devtools/images/debugger-step-in.png)
   skin/classic/browser/devtools/debugger-step-in@2x.png     (../shared/devtools/images/debugger-step-in@2x.png)
   skin/classic/browser/devtools/debugger-step-out.png       (../shared/devtools/images/debugger-step-out.png)
   skin/classic/browser/devtools/debugger-step-out@2x.png    (../shared/devtools/images/debugger-step-out@2x.png)
   skin/classic/browser/devtools/debugger-step-over.png      (../shared/devtools/images/debugger-step-over.png)
   skin/classic/browser/devtools/debugger-step-over@2x.png   (../shared/devtools/images/debugger-step-over@2x.png)
-  skin/classic/browser/devtools/debugger-blackbox-eye.png   (../shared/devtools/images/debugger-blackbox-eye.png)
   skin/classic/browser/devtools/debugger-blackbox.png       (../shared/devtools/images/debugger-blackbox.png)
   skin/classic/browser/devtools/debugger-blackbox@2x.png    (../shared/devtools/images/debugger-blackbox@2x.png)
   skin/classic/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
   skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
   skin/classic/browser/devtools/tracer-icon.png             (../shared/devtools/images/tracer-icon.png)
   skin/classic/browser/devtools/tracer-icon@2x.png          (../shared/devtools/images/tracer-icon@2x.png)
   skin/classic/browser/devtools/floating-scrollbars.css     (devtools/floating-scrollbars.css)
   skin/classic/browser/devtools/floating-scrollbars-light.css (devtools/floating-scrollbars-light.css)

index b643bfc6f67da9c4934f05510b5cbd296e901bcd..b81e691acd2c1d3027ec3675c5e189571f488ad4
GIT binary patch
literal 127
zc%17D@N?(olHy`uVBq!ia0vp^%s?#1!2%?mGjj@ol$)oEV@L&KY3D_*0|p$-$!e|t
z{<B*v>xi7%(cZ0|Et(~0%`{u0V|nJ;2}O(Arrh@rl<|7~{J5BG@Q+IiruKc$pHX|{
b!dIproh%O9ES#HxCNg-s`njxgN@xNAt4%7z

index 11cfca4c149871587aec2e18b71fd6ef3d49823a..2a6b04241cb3920098af122a413107d9ebab4a4e
GIT binary patch
literal 188
zc%17D@N?(olHy`uVBq!ia0vp^Y(Q+o!2%@Tt1xo_sb)_X$B+ufsS^Xa4j6Da=h}VS
z|66`rw%}oA#~F=hCzwR7a>(5O`)1*XH{l!k{O<10^IlZC%45-#h@WfSR&ubI?c6wN
zh4F??Gq>9uuAW}Pn|@uB;VQ`X-KKb!i}{vlgWd9+6Tc?1UAQKHdPceNiU+q&o4FNh
oFwGF_dthb!Q?S=~S;!;i+XWo;B463vfX-p?boFyt=akR{0K&INjQ{`u

--- a/browser/themes/shared/devtools/debugger.inc.css
+++ b/browser/themes/shared/devtools/debugger.inc.css
@@ -106,16 +106,34 @@
 #sources .selected > .black-boxed {
   color: rgba(255,255,255,0.4);
 }
 
 #sources .black-boxed > .dbg-breakpoint {
   display: none;
 }
 
+/* Debugger unblackbox button */
+
+#black-boxed-message-button > .button-box > .button-icon {
+  width: 16px;
+  height: 16px;
+  background-image: url(debugger-blackbox.png);
+  background-position: 0 0;
+  background-size: 32px 16px;
+  background-repeat: no-repeat;
+  -moz-margin-end: 5px;
+}
+
+@media (min-resolution: 2dppx) {
+  #black-boxed-message-button > .button-box > .button-icon {
+    background-image: url(debugger-blackbox@2x.png);
+  }
+}
+
 /* Black box message and source progress meter */
 
 #black-boxed-message,
 #source-progress-container {
   /* Prevent the container deck from aquiring the size from this message. */
   min-width: 1px;
   min-height: 1px;
 }

deleted file mode 100755
index 1169100fbb7d10c7fcfd0776e999bae4e9fc9c57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100755
index 1169100fbb7d10c7fcfd0776e999bae4e9fc9c57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

new file mode 100644
index 0000000000000000000000000000000000000000..90421287cc6c9631cb8c182a9e89697fe71b22f7
GIT binary patch
literal 1032
zc$@(U1o!)iP)<h;3K|Lk000e1NJLTq003YB001xu1^@s6?iPQ~000BeNkl<Zc-rlm
z%W4!s6o$)aOw@QuOi)x*#Dz}0B%)EoOF)sR(Kqk{;>M*xP!JPWiks}*h?|g&#JdmR
zgJhAN1hQ~4T~((p17)3{%%r>84soV?g!93HqN}=7`A^M%s;e165ClOG1VIo4K@bE%
z5X66h*6yfM>L4SE5nm{E1EVF9;GA3UC)F=h^%_9+wg7V<!?*7Wp+-431Aa^=YfW(e
zYb%w?b^zEPMf$MTx*x;0O8{=a@9+Ko-K~p@zZAlpC~_tA1K7tx>JL7?{WX;R2--g7
z#tg6)0Y&!$p2UTNVrInk2;gE|eCOPnB34Yd06QKMnoB(`m3@VQ?a&y!chR{XRuFS@
zbDdI}(;=aivR5hq=P<Ax>n~pXNb8aWGZh!r3qFZfQ$Hze<2CFHBx(x4?PEE!xafMg
zQVC%rfD33f@%cwl)TdPSYD<XEwLT`4eV-IlJ#r2`G7R=fWycap12YW(dvmm$-k{x>
zB|+OV3T{w*tRE~7%1RyZBF=<Xeo*{y5+;*&WZwRCZd(qvxkU(dEwu7iE53AYHwU=n
zuXQwg@>@};py%`DMO8|<$4~Sg2XhPC^?f)t^bD*Q&bfBhBxYx4JGfGpLtc)y6Z>Dg
zyznJy%uts2LRCkx59<Xcv1wa03Hn7^!No}}6JP53U&%~;5^!u<VdheeHN#gYCMMdX
zv}e-_Zp==)YJQ(Be$2)On<4(1ns<j+E~^7qetZmGV|Cy?Y0ry<dC<rt;ImM?kobRA
zZp?B@nc~Zu`0+r?YIFkH1lZ>*O#s@?za&6_9>>4g$OJ4(b7rLp$g&*-?@4<e-rw+F
z@xsEwW&!3+vn@z~dHv&u+t`F(aXS{u3=7IAxV8DGy&C}7Vcclsu>;C3!eH)U1dDJu
zk?(M9-a8-++~=o?9|H?^N+L(Fez0cZCw0n;^(85uS@AX$#|9GcIgj%c&iRh8cZXlH
zLUs&b&nLyNUiW={EDtI;0jWO)YQb3Mi<q<z1LA*)0ESsk2;p`KFIX}O+2Z@Y!9emx
zaYw}R1Sb;maV|~jQAEnhpOMC#W;qi@uCM0f*`ANKld|%!a?W?MA}E*3-5l%_q3qXH
z9LC|8m(Dqyd?Db8Y}QuuZ-;Tx+OzZX^P5=F;92=^Ye^L7px1+b#<@9O{Ku5+m#mQ2
zOKFBG_~zVd;8qVmWN>9iIG8)jKFFx*O>UN~X#>lV)gG)>v_2F?`pEAn;SLaYN=r44
z_~)ba!wK<;{F6Z97YvC{5ClOG1VIo4K@bE%<jF5D@R$y|Pz_H20000<MNUMnLSTY$
CGURmt

--- a/browser/themes/shared/devtools/netmonitor.inc.css
+++ b/browser/themes/shared/devtools/netmonitor.inc.css
@@ -401,24 +401,44 @@ label.requests-menu-status-code {
 #details-pane-toggle {
   background: none;
   box-shadow: none;
   border-color: transparent;
   list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png");
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
+#details-pane-toggle > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
 #details-pane-toggle[pane-collapsed] {
   list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
 }
 
 #details-pane-toggle:active {
   -moz-image-region: rect(0px,32px,16px,16px);
 }
 
+@media (min-resolution: 2dppx) {
+  #details-pane-toggle {
+    list-style-image: url("chrome://browser/skin/devtools/debugger-collapse@2x.png");
+    -moz-image-region: rect(0px,32px,32px,0px);
+  }
+
+  #details-pane-toggle[pane-collapsed] {
+    list-style-image: url("chrome://browser/skin/devtools/debugger-expand@2x.png");
+  }
+
+  #details-pane-toggle:active {
+    -moz-image-region: rect(0px,64px,32px,32px);
+  }
+}
+
 /* Network request details tabpanels */
 
 .theme-dark .tabpanel-content {
   background-color: #343c45; /* Toolbars */
   color: #f5f7fa; /* Light foreground text */
 }
 
 /* Summary tabpanel */

--- a/browser/themes/shared/devtools/shadereditor.inc.css
+++ b/browser/themes/shared/devtools/shadereditor.inc.css
@@ -65,26 +65,33 @@
 .side-menu-widget-item.selected > .side-menu-widget-item-checkbox,
 .side-menu-widget-item-checkbox:not([checked]) {
   opacity: 1;
   transition: opacity .15s ease-out 0s;
 }
 
 .side-menu-widget-item-checkbox .checkbox-check {
   -moz-appearance: none;
-  background: url(itemToggle.png);
+  background-image: url(itemToggle.png);
+  background-color: transparent;
   background-repeat: no-repeat;
   background-clip: content-box;
   background-size: 32px 16px;
   background-position: -16px 0;
   width: 16px;
   height: 16px;
   border: 0;
 }
 
+@media (min-resolution: 2dppx) {
+  .side-menu-widget-item-checkbox .checkbox-check {
+    background-image: url(itemToggle@2x.png);
+  }
+}
+
 .side-menu-widget-item-checkbox[checked] .checkbox-check {
   background-position: 0 0;
 }
 
 /* Invert all toggle icons but the one in the active row for light theme */
 .theme-light .side-menu-widget-item:not(.selected) .checkbox-check {
   filter: url(filters.svg#invert);
 }

--- a/browser/themes/shared/devtools/styleeditor.css
+++ b/browser/themes/shared/devtools/styleeditor.css
@@ -99,20 +99,27 @@
 
 .stylesheet-enabled {
   padding: 8px 0;
   margin: 0 8px;
   background-image: url(itemToggle.png);
   background-repeat: no-repeat;
   background-clip: content-box;
   background-position: 0 8px;
+  background-size: 48px 24px;
   width: 24px;
   height: 40px;
 }
 
+@media (min-resolution: 2dppx) {
+  .stylesheet-enabled {
+    background-image: url(itemToggle@2x.png);
+  }
+}
+
 .disabled > .stylesheet-enabled {
   background-position: -24px 8px;
 }
 
 /* Invert all toggle icons but the one in the active row for light theme */
 .theme-light .splitview-nav > li:not(.splitview-active) .stylesheet-enabled {
   filter: url(filters.svg#invert);
 }
@@ -188,21 +195,21 @@ h3 {
   }
 
   .stylesheet-sidebar {
     width: 180px;
   }
 }
 
 .theme-light .csscoverage-report {
-  background: url(background-noise-toolbar.png), #f0f1f2; /* Toolbars */
+  background-color: #f0f1f2; /* Toolbars */
 }
 
 .theme-dark .csscoverage-report {
-  background: url(background-noise-toolbar.png), #343c45; /* Toolbars */
+  background-color: #343c45; /* Toolbars */
 }
 
 .csscoverage-report-container {
   height: 100vh;
   padding: 0 30px;
 }
 
 .csscoverage-report-content {

--- a/browser/themes/shared/incontentprefs/preferences.css
+++ b/browser/themes/shared/incontentprefs/preferences.css
@@ -136,45 +136,38 @@ tab[selected] > .tab-middle > .tab-text 
 
 button,
 menulist {
   -moz-appearance: none;
   height: 30px;
   color: #333333;
   line-height: 20px;
   text-shadow: 0 1px 1px #FEFFFE;
-  border: 1px solid rgba(23,50,77,0.4);
+  border: 1px solid #C1C1C1;
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-left-colors: none !important;
-  border-radius: 5px;
-  box-shadow: 0 1px 1px 0 #FFFFFF, inset 0 2px 2px 0 #FFFFFF;
-  background-color: #F1F1F1;
-  background-image: linear-gradient(#FFFFFF, rgba(255,255,255,0.1));
+  border-radius: 2px;
+  background-color: #FBFBFB;
 }
 
 button:not([disabled="true"]):hover,
 menulist:not([disabled="true"]):hover {
-  background-image: linear-gradient(#FFFFFF, rgba(255,255,255,0.6));
+  background-color: #EBEBEB;
 }
 
 button:not([disabled="true"]):hover:active,
 menulist[open="true"]:not([disabled="true"]) {
-  background-image: linear-gradient(rgba(255,255,255,0.1),
-                                    rgba(255,255,255,0.6));
+  background-color: #DADADA;
 }
 
 button[disabled="true"],
 menulist[disabled="true"] {
-  background-image: linear-gradient(rgba(255,255,255,0.5),
-                                    rgba(255,255,255,0.1));
-  border-color: rgba(23,50,77,0.25);
-  color: rgba(115,121,128,0.5);
-  text-shadow: 0 1px 1px #FFFFFF;
+  opacity: 0.5;
 }
 
 button > .button-box,
 menulist > .menulist-label-box {
   padding-right: 10px !important;
   padding-left: 10px !important;
 }
 
@@ -236,22 +229,22 @@ button[type="menu"] > .button-box > .but
 
 .spinbuttons-button {
   -moz-margin-start: 10px !important;
   -moz-margin-end: 2px !important;
 }
 
 .spinbuttons-up {
   margin-top: 2px !important;
-  border-radius: 4px 4px 0 0;
+  border-radius: 1px 1px 0 0;
 }
 
 .spinbuttons-down  {
   margin-bottom: 2px !important;
-  border-radius: 0 0 4px 4px;
+  border-radius: 0 0 1px 1px;
 }
 
 .spinbuttons-button > .button-box {
   padding: 1px 5px 2px !important;
 }
 
 .spinbuttons-up > .button-box > .button-icon {
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
@@ -298,17 +291,17 @@ menulist[disabled="true"]:not([editable=
     height: 16px;
   }
 }
 
 menulist > menupopup,
 button[type="menu"] > menupopup {
   -moz-appearance: none;
   border: 1px solid rgba(23,50,77,0.4);
-  border-radius: 5px;
+  border-radius: 2px;
   background-color: #FFFFFF;
 }
 
 menulist > menupopup menu,
 menulist > menupopup menuitem,
 button[type="menu"] > menupopup menu,
 button[type="menu"] > menupopup menuitem {
   -moz-appearance: none;
@@ -353,47 +346,41 @@ button[type="menu"] > menupopup menusepa
 textbox {
   -moz-appearance: none;
   height: 30px;
   color: #333333;
   line-height: 20px;
   text-shadow: 0 1px 1px #FEFFFE;
   padding-right: 10px;
   padding-left: 10px;
-  border: 1px solid rgba(23,50,77,0.4);
+  border: 1px solid #C1C1C1;
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-left-colors: none !important;
-  border-radius: 5px;
-  box-shadow: 0 1px 1px 0 #FFFFFF, inset 0 2px 2px 0 rgba(0,0,0,0.03);
-  background-color: #F1F1F1;
-  background-image: linear-gradient(#FFFFFF, rgba(255,255,255,0.8));
+  border-radius: 2px;
+  background-color: #FFF;
 }
 
 textbox[focused] {
-  color: #424E5A;
-  border-color: #0096DC;
-  box-shadow: 0 0 2px 2px rgba(0,150,220,0.35), inset 0 0 2px 0 #0096DC;
+  border-color: #0095DD;
 }
 
 textbox[disabled="true"] {
-  color: rgba(115,121,128,0.5);
-  border-color: rgba(23,50,77,0.25);
-  background-image: linear-gradient(rgba(255,255,255,0.5), rgba(255,255,255,0.4));
+  opacity: 0.5;
 }
 
 /* Links */
 
 .text-link,
 .inline-link,
 html|a.inline-link {
   font-size: 1.25rem;
   line-height: 22px;
-  color: #0096DC;
+  color: #0095DD;
 }
 
 .text-link:hover,
 .inline-link:hover {
   color: #4CB1FF;
   text-decoration: none;
 }
 
@@ -706,59 +693,56 @@ filefield {
 }
 
 #handlersView {
   -moz-appearance: none;
   -moz-margin-start: 0;
   font-size: 1.25rem;
   line-height: 22px;
   color: #333333;
-  border: 1px solid rgba(23,50,77,0.4);
-  border-radius: 5px;
-  background-color: #F1F1F1;
+  border: 1px solid #C1C1C1;
+  border-radius: 2px;
+  background-color: #FBFBFB;
   overflow-y: auto;
 }
 
 #typeColumn,
 #actionColumn {
   -moz-appearance: none;
   font-family: "Clear Sans", sans-serif;
   line-height: 20px;
   color: #333333;
   height: 36px;
   padding: 0 10px;
-  background-color: #F7F7F7;
-  border: 1px solid #CCCCCC;
+  background-color: #FBFBFB;
+  border: 1px solid #C1C1C1;
   -moz-border-top-colors: none;
   -moz-border-right-colors: none;
   -moz-border-bottom-colors: none;
   -moz-border-left-colors: none;
-  text-shadow: 0 1px 1px #FFFFFF;
 }
 
 #typeColumn:-moz-locale-dir(ltr),
 #actionColumn:-moz-locale-dir(rtl) {
-  border-top-left-radius: 5px;
+  border-top-left-radius: 2px;
 }
 
 #typeColumn:-moz-locale-dir(rtl),
 #actionColumn:-moz-locale-dir(ltr) {
-  border-top-right-radius: 5px;
+  border-top-right-radius: 2px;
 }
 
 #typeColumn:hover,
 #actionColumn:hover {
-  border-color: #737980;
+  border-color: #0095DD;
 }
 
 #typeColumn:hover:active,
 #actionColumn:hover:active {
   padding: 0 10px;
-  border-color: #0096DC;
-  box-shadow: 0 0 2px 2px rgba(0,150,220,0.35), inset 0 0 2px 0 #0096DC;
 }
 
 #typeColumn > .treecol-sortdirection[sortDirection=ascending],
 #actionColumn > .treecol-sortdirection[sortDirection=ascending],
 #typeColumn > .treecol-sortdirection[sortDirection=descending],
 #actionColumn > .treecol-sortdirection[sortDirection=descending] {
   -moz-appearance: none;
   list-style-image: url("chrome://browser/skin/preferences/in-content/sorter.png");
@@ -808,47 +792,35 @@ filefield {
 }
 
 /* XXX This style is for bug 740213 and should be removed once that
    bug has a solution. */
 description > html|a {
   cursor: pointer;
 }
 
-/* Sync Pane */
-
+#offlineAppsList,
 #syncEnginesList {
   -moz-appearance: none;
   color: #333333;
   padding: 10px;
-  border: 1px solid rgba(23,50,77,0.4);
-  border-radius: 5px;
-  background-color: #F1F1F1;
+  border: 1px solid #C1C1C1;
+  border-radius: 2px;
+  background-color: #FBFBFB;
 }
 
-/* Advanced Pane */
-
 #advancedPrefs {
   padding-bottom: 0; /* no padding needed in inContent prefs */
 }
 
 #encryptionPanel {
   margin-top: 15px;
   -moz-margin-start: 60px;
 }
 
-#offlineAppsList {
-  -moz-appearance: none;
-  color: #333333;
-  padding: 2px;
-  border: 1px solid rgba(23,50,77,0.4);
-  border-radius: 5px;
-  background-color: #F1F1F1;
-}
-
 #telemetryLearnMore,
 #FHRLearnMore,
 #crashReporterLearnMore {
   /* center the links */
   margin-top: 8px;
   margin-bottom: 8px;
 }
 

--- a/browser/themes/shared/translation/infobar.inc.css
+++ b/browser/themes/shared/translation/infobar.inc.css
@@ -21,51 +21,28 @@ notification[value="translation"][state=
 }
 
 @media (min-resolution: 1.25dppx) {
   notification[value="translation"][state="translating"] .messageImage {
     list-style-image: url(chrome://browser/skin/translating-16@2x.png);
   }
 }
 
-notification[value="translation"] {
-  min-height: 40px;
-}
-
 notification[value="translation"] button,
 notification[value="translation"] menulist {
   -moz-appearance: none;
   border-width: 1px;
   -moz-border-top-colors: none;
   -moz-border-right-colors: none;
   -moz-border-bottom-colors: none;
   -moz-border-left-colors: none;
   border-radius: 2px;
   min-width: 0;
-  min-height: 30px;
-  -moz-padding-end: 1ch;
   box-shadow: 0 1px rgba(255, 255, 255, 0.5), 0 1px rgba(255, 255, 255, 0.5) inset;
 }
 
-notification[value="translation"] button > .button-box,
-notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
-  padding: 0;
-  -moz-margin-start: 3ch;
-}
-
-notification[value="translation"] button:not([type="menu"]) > .button-box {
-  -moz-margin-end: 3ch;
-}
-
-notification[value="translation"] button,
-notification[value="translation"] menulist,
-notification[value="translation"] menulist > .menulist-label-box {
-  -moz-margin-start: 1ch;
-  -moz-margin-end: 1ch;
-}
-
 notification[value="translation"] menulist > .menulist-dropmarker {
   -moz-appearance: toolbarbutton-dropdown;
   border: none;
   background-color: transparent;
   margin: auto;
   padding: 5px 0;
 }

--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -2345,37 +2345,54 @@ toolbarbutton.bookmark-item[dragover="tr
 #pointerLock-cancel {
   margin: 0px;
 }
 
 /* Translation infobar */
 
 %include ../shared/translation/infobar.inc.css
 
+notification[value="translation"] {
+  min-height: 40px;
+}
+
 @media (-moz-windows-default-theme) {
   notification[value="translation"],
   notification[value="translation"] button,
   notification[value="translation"] menulist {
+    min-height: 30px;
     color: #545454;
   }
 
   notification[value="translation"] {
     background-color: #EEE;
   }
 
+  notification[value="translation"] button,
+  notification[value="translation"] menulist {
+    -moz-padding-end: 1ch;
+  }
+
   notification[value="translation"] menulist {
     border: 1px solid #C1C1C1;
     background-color: #FFF;
   }
 
   notification[value="translation"] button {
     border: 1px solid #C1C1C1;
     background-color: #FBFBFB;
   }
 
+  notification[value="translation"] button,
+  notification[value="translation"] menulist,
+  notification[value="translation"] menulist > .menulist-label-box {
+    -moz-margin-start: 1ch;
+    -moz-margin-end: 1ch;
+  }
+
   notification[value="translation"] button:hover,
   notification[value="translation"] button:active,
   notification[value="translation"] menulist:hover,
   notification[value="translation"] menulist:active {
     background-color: #EBEBEB;
   }
 
   notification[value="translation"] button[anonid="translate"] {
@@ -2390,16 +2407,26 @@ toolbarbutton.bookmark-item[dragover="tr
     background-color: #008ACB;
   }
 
   notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker,
   notification[value="translation"] menulist > .menulist-dropmarker {
     list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
   }
 
+  notification[value="translation"] button > .button-box,
+  notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
+    padding: 0;
+    -moz-margin-start: 3ch;
+  }
+
+  notification[value="translation"] button:not([type="menu"]) > .button-box {
+    -moz-margin-end: 3ch;
+  }
+
   @media (min-resolution: 1.25dppx) {
     notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker,
     notification[value="translation"] menulist > .menulist-dropmarker {
       list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow@2x.png");
     }
   }
 }
 

--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -277,16 +277,17 @@ browser.jar:
 *       skin/classic/browser/devtools/splitview.css                 (../shared/devtools/splitview.css)
         skin/classic/browser/devtools/styleeditor.css               (../shared/devtools/styleeditor.css)
 *       skin/classic/browser/devtools/webaudioeditor.css            (devtools/webaudioeditor.css)
         skin/classic/browser/devtools/magnifying-glass.png          (../shared/devtools/images/magnifying-glass.png)
         skin/classic/browser/devtools/magnifying-glass@2x.png       (../shared/devtools/images/magnifying-glass@2x.png)
         skin/classic/browser/devtools/magnifying-glass-light.png    (../shared/devtools/images/magnifying-glass-light.png)
         skin/classic/browser/devtools/magnifying-glass-light@2x.png  (../shared/devtools/images/magnifying-glass-light@2x.png)
         skin/classic/browser/devtools/itemToggle.png                (../shared/devtools/images/itemToggle.png)
+        skin/classic/browser/devtools/itemToggle@2x.png             (../shared/devtools/images/itemToggle@2x.png)
         skin/classic/browser/devtools/itemArrow-dark-rtl.svg        (../shared/devtools/images/itemArrow-dark-rtl.svg)
         skin/classic/browser/devtools/itemArrow-dark-ltr.svg        (../shared/devtools/images/itemArrow-dark-ltr.svg)
         skin/classic/browser/devtools/itemArrow-rtl.svg             (../shared/devtools/images/itemArrow-rtl.svg)
         skin/classic/browser/devtools/itemArrow-ltr.svg             (../shared/devtools/images/itemArrow-ltr.svg)
         skin/classic/browser/devtools/noise.png                     (../shared/devtools/images/noise.png)
         skin/classic/browser/devtools/dropmarker.png                (../shared/devtools/images/dropmarker.png)
         skin/classic/browser/devtools/layoutview.css                (../shared/devtools/layoutview.css)
         skin/classic/browser/devtools/debugger-collapse.png         (../shared/devtools/images/debugger-collapse.png)
@@ -298,17 +299,16 @@ browser.jar:
         skin/classic/browser/devtools/debugger-play.png             (../shared/devtools/images/debugger-play.png)
         skin/classic/browser/devtools/debugger-play@2x.png          (../shared/devtools/images/debugger-play@2x.png)
         skin/classic/browser/devtools/debugger-step-in.png          (../shared/devtools/images/debugger-step-in.png)
         skin/classic/browser/devtools/debugger-step-in@2x.png       (../shared/devtools/images/debugger-step-in@2x.png)
         skin/classic/browser/devtools/debugger-step-out.png         (../shared/devtools/images/debugger-step-out.png)
         skin/classic/browser/devtools/debugger-step-out@2x.png      (../shared/devtools/images/debugger-step-out@2x.png)
         skin/classic/browser/devtools/debugger-step-over.png        (../shared/devtools/images/debugger-step-over.png)
         skin/classic/browser/devtools/debugger-step-over@2x.png     (../shared/devtools/images/debugger-step-over@2x.png)
-        skin/classic/browser/devtools/debugger-blackbox-eye.png     (../shared/devtools/images/debugger-blackbox-eye.png)
         skin/classic/browser/devtools/debugger-blackbox.png         (../shared/devtools/images/debugger-blackbox.png)
         skin/classic/browser/devtools/debugger-blackbox@2x.png      (../shared/devtools/images/debugger-blackbox@2x.png)
         skin/classic/browser/devtools/debugger-toggleBreakpoints.png  (../shared/devtools/images/debugger-toggleBreakpoints.png)
         skin/classic/browser/devtools/debugger-toggleBreakpoints@2x.png  (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
         skin/classic/browser/devtools/tracer-icon.png               (../shared/devtools/images/tracer-icon.png)
         skin/classic/browser/devtools/tracer-icon@2x.png            (../shared/devtools/images/tracer-icon@2x.png)
         skin/classic/browser/devtools/responsive-se-resizer.png     (../shared/devtools/images/responsive-se-resizer.png)
         skin/classic/browser/devtools/responsive-vertical-resizer.png (../shared/devtools/images/responsive-vertical-resizer.png)
@@ -672,16 +672,17 @@ browser.jar:
 *       skin/classic/aero/browser/devtools/splitview.css             (../shared/devtools/splitview.css)
         skin/classic/aero/browser/devtools/styleeditor.css           (../shared/devtools/styleeditor.css)
 *       skin/classic/aero/browser/devtools/webaudioeditor.css        (devtools/webaudioeditor.css)
         skin/classic/aero/browser/devtools/magnifying-glass.png      (../shared/devtools/images/magnifying-glass.png)
         skin/classic/aero/browser/devtools/magnifying-glass@2x.png   (../shared/devtools/images/magnifying-glass@2x.png)
         skin/classic/aero/browser/devtools/magnifying-glass-light.png (../shared/devtools/images/magnifying-glass-light.png)
         skin/classic/aero/browser/devtools/magnifying-glass-light@2x.png  (../shared/devtools/images/magnifying-glass-light@2x.png)
         skin/classic/aero/browser/devtools/itemToggle.png            (../shared/devtools/images/itemToggle.png)
+        skin/classic/aero/browser/devtools/itemToggle@2x.png         (../shared/devtools/images/itemToggle@2x.png)
         skin/classic/aero/browser/devtools/itemArrow-dark-rtl.svg    (../shared/devtools/images/itemArrow-dark-rtl.svg)
         skin/classic/aero/browser/devtools/itemArrow-dark-ltr.svg    (../shared/devtools/images/itemArrow-dark-ltr.svg)
         skin/classic/aero/browser/devtools/itemArrow-rtl.svg         (../shared/devtools/images/itemArrow-rtl.svg)
         skin/classic/aero/browser/devtools/itemArrow-ltr.svg         (../shared/devtools/images/itemArrow-ltr.svg)
         skin/classic/aero/browser/devtools/noise.png                 (../shared/devtools/images/noise.png)
         skin/classic/aero/browser/devtools/dropmarker.png            (../shared/devtools/images/dropmarker.png)
         skin/classic/aero/browser/devtools/layoutview.css            (../shared/devtools/layoutview.css)
         skin/classic/aero/browser/devtools/debugger-collapse.png     (../shared/devtools/images/debugger-collapse.png)
@@ -693,17 +694,16 @@ browser.jar:
         skin/classic/aero/browser/devtools/debugger-play.png         (../shared/devtools/images/debugger-play.png)
         skin/classic/aero/browser/devtools/debugger-play@2x.png      (../shared/devtools/images/debugger-play@2x.png)
         skin/classic/aero/browser/devtools/debugger-step-in.png      (../shared/devtools/images/debugger-step-in.png)
         skin/classic/aero/browser/devtools/debugger-step-in@2x.png   (../shared/devtools/images/debugger-step-in@2x.png)
         skin/classic/aero/browser/devtools/debugger-step-out.png     (../shared/devtools/images/debugger-step-out.png)
         skin/classic/aero/browser/devtools/debugger-step-out@2x.png  (../shared/devtools/images/debugger-step-out@2x.png)
         skin/classic/aero/browser/devtools/debugger-step-over.png    (../shared/devtools/images/debugger-step-over.png)
         skin/classic/aero/browser/devtools/debugger-step-over@2x.png  (../shared/devtools/images/debugger-step-over@2x.png)
-        skin/classic/aero/browser/devtools/debugger-blackbox-eye.png  (../shared/devtools/images/debugger-blackbox-eye.png)
         skin/classic/aero/browser/devtools/debugger-blackbox.png      (../shared/devtools/images/debugger-blackbox.png)
         skin/classic/aero/browser/devtools/debugger-blackbox@2x.png   (../shared/devtools/images/debugger-blackbox@2x.png)
         skin/classic/aero/browser/devtools/debugger-toggleBreakpoints.png (../shared/devtools/images/debugger-toggleBreakpoints.png)
         skin/classic/aero/browser/devtools/debugger-toggleBreakpoints@2x.png (../shared/devtools/images/debugger-toggleBreakpoints@2x.png)
         skin/classic/aero/browser/devtools/tracer-icon.png           (../shared/devtools/images/tracer-icon.png)
         skin/classic/aero/browser/devtools/tracer-icon@2x.png        (../shared/devtools/images/tracer-icon@2x.png)
         skin/classic/aero/browser/devtools/responsive-se-resizer.png (../shared/devtools/images/responsive-se-resizer.png)
         skin/classic/aero/browser/devtools/responsive-vertical-resizer.png (../shared/devtools/images/responsive-vertical-resizer.png)

index af4403a500a0e320d1fac2c4d7b9196c9f8973eb..8f46ed201249696e03e6ebd408afca7faa2ec237
GIT binary patch
literal 143
zc%17D@N?(olHy`uVBq!ia0vp^%s?#1!3HE>CM@{{q{2L1978G?lam~nR?P8#KhN-1
zRr_X!Of|I?I?@8hhb-PW^e7!}32kHUm^ssdMWDDTRY0bNN8FKbnOxo)88MA^*42!6
qB;16<j(N^0wlLV!dnWOaY#xJoF^8ddc3d6M1_n=8KbLh*2~7Y4_$v4S

index 2f8cae3b3251af8c85416c09ec2b7d3b094594e2..3f62dda73e3021820742e084c0c6b5ce7bda4ea9
GIT binary patch
literal 143
zc%17D@N?(olHy`uVBq!ia0vp^%s?#1!3HE>CM@{{q{2L1978G?lMnFP?X5m`LN)OW
z&ytxl8fpa6Sd-i&+Ic%38tI&nF)QIS7Vcn3;+vq*bGT2*c|!Bbc46&y)>ZASs~P7=
rxCw_H^P5wAV`J59&e%55W@ZK-M)rae8!nsx+Q8uH>gTe~DWM4fO<OGr

index c76c615fc18c37261e76ab39db98b18e19c67013..b4192f776e91b155a907592175310c33119343a2
GIT binary patch
literal 143
zc%17D@N?(olHy`uVBq!ia0vp^%s?#1!3HE>CM@{{q{2L1978G?lMnFP?X5nxBJ<2q
zo+UG9G}H*Bu_n1mwDWd6G}1XCV^+dvEZo76#5X~q=Ww5r^MvM=?ZVpatgG5tS2NC$
ra1#zY<~OJK#>T4IoUv`9&CCob{Opa_Hu)|E+Q8uH>gTe~DWM4fdDbm6

--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -448,17 +448,18 @@ private:
   nsRefPtr<nsFrameLoader> mFrameLoader;
 };
 
 nsresult
 nsFrameLoader::ReallyStartLoadingInternal()
 {
   NS_ENSURE_STATE(mURIToLoad && mOwnerContent && mOwnerContent->IsInDoc());
 
-  PROFILER_LABEL("nsFrameLoader", "ReallyStartLoading");
+  PROFILER_LABEL("nsFrameLoader", "ReallyStartLoading",
+    js::ProfileEntry::Category::OTHER);
 
   nsresult rv = MaybeCreateDocShell();
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   if (mRemoteFrame) {
     if (!mRemoteBrowser) {
@@ -2094,17 +2095,18 @@ nsFrameLoader::TryRemoteBrowser()
   nsCOMPtr<nsIXULWindow> window(do_GetInterface(parentOwner));
   if (!window) {
     return false;
   }
   if (NS_FAILED(window->GetChromeFlags(&chromeFlags))) {
     return false;
   }
 
-  PROFILER_LABEL("nsFrameLoader", "CreateRemoteBrowser");
+  PROFILER_LABEL("nsFrameLoader", "CreateRemoteBrowser",
+    js::ProfileEntry::Category::OTHER);
 
   MutableTabContext context;
   nsCOMPtr<mozIApplication> ownApp = GetOwnApp();
   nsCOMPtr<mozIApplication> containingApp = GetContainingApp();
   ScrollingBehavior scrollingBehavior = DEFAULT_SCROLLING;
 
   if (Preferences::GetBool("dom.browser_frames.useAsyncPanZoom", false) ||
       mOwnerContent->AttrValueIs(kNameSpaceID_None,

--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -915,17 +915,18 @@ nsObjectLoadingContent::NotifyOwnerDocum
     QueueCheckPluginStopEvent();
 }
 
 // nsIRequestObserver
 NS_IMETHODIMP
 nsObjectLoadingContent::OnStartRequest(nsIRequest *aRequest,
                                        nsISupports *aContext)
 {
-  PROFILER_LABEL("nsObjectLoadingContent", "OnStartRequest");
+  PROFILER_LABEL("nsObjectLoadingContent", "OnStartRequest",
+    js::ProfileEntry::Category::NETWORK);
 
   LOG(("OBJLC [%p]: Channel OnStartRequest", this));
 
   if (aRequest != mChannel || !aRequest) {
     // happens when a new load starts before the previous one got here
     return NS_BINDING_ABORTED;
   }
 
@@ -977,16 +978,19 @@ nsObjectLoadingContent::OnStartRequest(n
   return LoadObject(true, false, aRequest);
 }
 
 NS_IMETHODIMP
 nsObjectLoadingContent::OnStopRequest(nsIRequest *aRequest,
                                       nsISupports *aContext,
                                       nsresult aStatusCode)
 {
+  PROFILER_LABEL("nsObjectLoadingContent", "OnStopRequest",
+    js::ProfileEntry::Category::NETWORK);
+
   NS_ENSURE_TRUE(nsContentUtils::IsCallerChrome(), NS_ERROR_NOT_AVAILABLE);
 
   if (aRequest != mChannel) {
     return NS_BINDING_ABORTED;
   }
 
   mChannel = nullptr;
 

--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -1908,17 +1908,19 @@ nsXMLHttpRequest::OnDataAvailable(nsIReq
 
   return NS_OK;
 }
 
 /* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
 NS_IMETHODIMP
 nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
 {
-  PROFILER_LABEL("nsXMLHttpRequest", "OnStartRequest");
+  PROFILER_LABEL("nsXMLHttpRequest", "OnStartRequest",
+    js::ProfileEntry::Category::NETWORK);
+
   nsresult rv = NS_OK;
   if (!mFirstStartRequestSeen && mRequestObserver) {
     mFirstStartRequestSeen = true;
     mRequestObserver->OnStartRequest(request, ctxt);
   }
 
   if (request != mChannel) {
     // Can this still happen?
@@ -2150,17 +2152,19 @@ nsXMLHttpRequest::OnStartRequest(nsIRequ
 
   return NS_OK;
 }
 
 /* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult status, in wstring statusArg); */
 NS_IMETHODIMP
 nsXMLHttpRequest::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult status)
 {
-  PROFILER_LABEL("content", "nsXMLHttpRequest::OnStopRequest");
+  PROFILER_LABEL("nsXMLHttpRequest", "OnStopRequest",
+    js::ProfileEntry::Category::NETWORK);
+
   if (request != mChannel) {
     // Can this still happen?
     return NS_OK;
   }
 
   mWaitingForOnStopRequest = false;
 
   if (mRequestObserver) {

--- a/content/html/content/src/nsGenericHTMLFrameElement.cpp
+++ b/content/html/content/src/nsGenericHTMLFrameElement.cpp
@@ -71,17 +71,18 @@ nsGenericHTMLFrameElement::BindToTree(ns
                                                  aBindingParent,
                                                  aCompileEventHandlers);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (aDocument) {
     NS_ASSERTION(!nsContentUtils::IsSafeToRunScript(),
                  "Missing a script blocker!");
 
-    PROFILER_LABEL("nsGenericHTMLFrameElement", "BindToTree");
+    PROFILER_LABEL("nsGenericHTMLFrameElement", "BindToTree",
+      js::ProfileEntry::Category::OTHER);
 
     // We're in a document now.  Kick off the frame load.
     LoadSrc();
   }
 
   // We're now in document and scripts may move us, so clear
   // the mNetworkCreated flag.
   mNetworkCreated = false;

--- a/content/html/document/src/PluginDocument.cpp
+++ b/content/html/document/src/PluginDocument.cpp
@@ -68,17 +68,18 @@ public:
 private:
   nsRefPtr<PluginDocument> mPluginDoc;
 };
 
 
 NS_IMETHODIMP
 PluginStreamListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
 {
-  PROFILER_LABEL("PluginStreamListener", "OnStartRequest");
+  PROFILER_LABEL("PluginStreamListener", "OnStartRequest",
+    js::ProfileEntry::Category::NETWORK);
 
   nsCOMPtr<nsIContent> embed = mPluginDoc->GetPluginContent();
   nsCOMPtr<nsIObjectLoadingContent> objlc = do_QueryInterface(embed);
   nsCOMPtr<nsIStreamListener> objListener = do_QueryInterface(objlc);
 
   if (!objListener) {
     NS_NOTREACHED("PluginStreamListener without appropriate content node");
     return NS_BINDING_ABORTED;

--- a/content/svg/content/src/SVGIFrameElement.cpp
+++ b/content/svg/content/src/SVGIFrameElement.cpp
@@ -270,17 +270,18 @@ SVGIFrameElement::BindToTree(nsIDocument
                                          aBindingParent,
                                          aCompileEventHandlers);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (aDocument) {
     NS_ASSERTION(!nsContentUtils::IsSafeToRunScript(),
                  "Missing a script blocker!");
 
-    PROFILER_LABEL("SVGIFrameElement", "BindToTree");
+    PROFILER_LABEL("SVGIFrameElement", "BindToTree",
+      js::ProfileEntry::Category::OTHER);
 
     // We're in a document now.  Kick off the frame load.
     LoadSrc();
 
     if (HasAttr(kNameSpaceID_None, nsGkAtoms::sandbox)) {
       if (mFrameLoader) {
         mFrameLoader->ApplySandboxFlags(GetSandboxFlags());
       }

--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -658,17 +658,19 @@ nsDOMWindowUtils::SendMouseEventToWindow
                                          int32_t aClickCount,
                                          int32_t aModifiers,
                                          bool aIgnoreRootScrollFrame,
                                          float aPressure,
                                          unsigned short aInputSourceArg,
                                          bool aIsSynthesized,
                                          uint8_t aOptionalArgCount)
 {
-  PROFILER_LABEL("nsDOMWindowUtils", "SendMouseEventToWindow");
+  PROFILER_LABEL("nsDOMWindowUtils", "SendMouseEventToWindow",
+    js::ProfileEntry::Category::EVENTS);
+
   return SendMouseEventCommon(aType, aX, aY, aButton, aClickCount, aModifiers,
                               aIgnoreRootScrollFrame, aPressure,
                               aInputSourceArg, true, nullptr,
                               aOptionalArgCount >= 4 ? aIsSynthesized : true);
 }
 
 static LayoutDeviceIntPoint
 ToWidgetPoint(const CSSPoint& aPoint, const nsPoint& aOffset,
@@ -1420,17 +1422,19 @@ nsDOMWindowUtils::Focus(nsIDOMElement* a
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsDOMWindowUtils::GarbageCollect(nsICycleCollectorListener *aListener,
                                  int32_t aExtraForgetSkippableCalls)
 {
-  PROFILER_LABEL("GC", "GarbageCollect");
+  PROFILER_LABEL("nsDOMWindowUtils", "GarbageCollect",
+    js::ProfileEntry::Category::GC);
+
   // Always permit this in debug builds.
 #ifndef DEBUG
   if (!nsContentUtils::IsCallerChrome()) {
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 #endif
 
   nsJSContext::GarbageCollectNow(JS::gcreason::DOM_UTILS);

--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1712,17 +1712,18 @@ FullGCTimerFired(nsITimer* aTimer, void*
 
 //static
 void
 nsJSContext::GarbageCollectNow(JS::gcreason::Reason aReason,
                                IsIncremental aIncremental,
                                IsShrinking aShrinking,
                                int64_t aSliceMillis)
 {
-  PROFILER_LABEL("GC", "GarbageCollectNow");
+  PROFILER_LABEL("nsJSContext", "GarbageCollectNow",
+    js::ProfileEntry::Category::GC);
 
   MOZ_ASSERT_IF(aSliceMillis, aIncremental == IncrementalGC);
 
   KillGCTimer();
   KillShrinkGCBuffersTimer();
 
   // Reset sPendingLoadCount in case the timer that fired was a
   // timer we scheduled due to a normal GC timer firing while
@@ -1754,17 +1755,18 @@ nsJSContext::GarbageCollectNow(JS::gcrea
     JS::GCForReason(sRuntime, aReason);
   }
 }
 
 //static
 void
 nsJSContext::ShrinkGCBuffersNow()
 {
-  PROFILER_LABEL("GC", "ShrinkGCBuffersNow");
+  PROFILER_LABEL("nsJSContext", "ShrinkGCBuffersNow",
+    js::ProfileEntry::Category::GC);
 
   KillShrinkGCBuffersTimer();
 
   JS::ShrinkGCBuffers(sRuntime);
 }
 
 static void
 FinishAnyIncrementalGC()
@@ -1935,31 +1937,34 @@ CycleCollectorStats::RunForgetSkippable(
 void
 nsJSContext::CycleCollectNow(nsICycleCollectorListener *aListener,
                              int32_t aExtraForgetSkippableCalls)
 {
   if (!NS_IsMainThread()) {
     return;
   }
 
-  PROFILER_LABEL("CC", "CycleCollectNow");
+  PROFILER_LABEL("nsJSContext", "CycleCollectNow",
+    js::ProfileEntry::Category::CC);
+
   gCCStats.PrepareForCycleCollectionSlice(aExtraForgetSkippableCalls);
   nsCycleCollector_collect(aListener);
   gCCStats.FinishCycleCollectionSlice();
 }
 
 //static
 void
 nsJSContext::RunCycleCollectorSlice()
 {
   if (!NS_IsMainThread()) {
     return;
   }
 
-  PROFILER_LABEL("CC", "RunCycleCollectorSlice");
+  PROFILER_LABEL("nsJSContext", "RunCycleCollectorSlice",
+    js::ProfileEntry::Category::CC);
 
   gCCStats.PrepareForCycleCollectionSlice();
 
   // Decide how long we want to budget for this slice. By default,
   // use an unlimited budget.
   int64_t sliceBudget = -1;
 
   if (sIncrementalCC) {
@@ -1985,17 +1990,18 @@ nsJSContext::RunCycleCollectorSlice()
 //static
 void
 nsJSContext::RunCycleCollectorWorkSlice(int64_t aWorkBudget)
 {
   if (!NS_IsMainThread()) {
     return;
   }
 
-  PROFILER_LABEL("CC", "RunCycleCollectorWorkSlice");
+  PROFILER_LABEL("nsJSContext", "RunCycleCollectorWorkSlice",
+    js::ProfileEntry::Category::CC);
 
   gCCStats.PrepareForCycleCollectionSlice();
   nsCycleCollector_collectSliceWork(aWorkBudget);
   gCCStats.FinishCycleCollectionSlice();
 }
 
 static void
 ICCTimerFired(nsITimer* aTimer, void* aClosure)

--- a/dom/base/nsJSUtils.cpp
+++ b/dom/base/nsJSUtils.cpp
@@ -191,17 +191,19 @@ nsresult
 nsJSUtils::EvaluateString(JSContext* aCx,
                           JS::SourceBufferHolder& aSrcBuf,
                           JS::Handle<JSObject*> aScopeObject,
                           JS::CompileOptions& aCompileOptions,
                           const EvaluateOptions& aEvaluateOptions,
                           JS::MutableHandle<JS::Value> aRetValue,
                           void **aOffThreadToken)
 {
-  PROFILER_LABEL("JS", "EvaluateString");
+  PROFILER_LABEL("nsJSUtils", "EvaluateString",
+    js::ProfileEntry::Category::JS);
+
   MOZ_ASSERT_IF(aCompileOptions.versionSet,
                 aCompileOptions.version != JSVERSION_UNKNOWN);
   MOZ_ASSERT_IF(aEvaluateOptions.coerceToString, aEvaluateOptions.needResult);
   MOZ_ASSERT_IF(!aEvaluateOptions.reportUncaught, aEvaluateOptions.needResult);
   MOZ_ASSERT(aCx == nsContentUtils::GetCurrentJSContext());
   MOZ_ASSERT(aSrcBuf.get());
 
   // Unfortunately, the JS engine actually compiles scripts with a return value

--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -383,17 +383,19 @@ EventTargetChainItemForChromeTarget(nsTA
 EventDispatcher::Dispatch(nsISupports* aTarget,
                           nsPresContext* aPresContext,
                           WidgetEvent* aEvent,
                           nsIDOMEvent* aDOMEvent,
                           nsEventStatus* aEventStatus,
                           EventDispatchingCallback* aCallback,
                           nsCOMArray<EventTarget>* aTargets)
 {
-  PROFILER_LABEL("EventDispatcher", "Dispatch");
+  PROFILER_LABEL("EventDispatcher", "Dispatch",
+    js::ProfileEntry::Category::EVENTS);
+
   NS_ASSERTION(aEvent, "Trying to dispatch without WidgetEvent!");
   NS_ENSURE_TRUE(!aEvent->mFlags.mIsBeingDispatched,
                  NS_ERROR_DOM_INVALID_STATE_ERR);
   NS_ASSERTION(!aTargets || !aEvent->message, "Wrong parameters!");
 
   // If we're dispatching an already created DOMEvent object, make
   // sure it is initialized!
   // If aTargets is non-null, the event isn't going to be dispatched.

--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -3568,17 +3568,19 @@ EventStateManager::IsHandlingUserInput()
 static void
 CreateMouseOrPointerWidgetEvent(WidgetMouseEvent* aMouseEvent,
                                 uint32_t aMessage,
                                 nsIContent* aRelatedContent,
                                 nsAutoPtr<WidgetMouseEvent>& aNewEvent)
 {
   WidgetPointerEvent* sourcePointer = aMouseEvent->AsPointerEvent();
   if (sourcePointer) {
-    PROFILER_LABEL("Input", "DispatchPointerEvent");
+    PROFILER_LABEL("Input", "DispatchPointerEvent",
+      js::ProfileEntry::Category::EVENTS);
+
     nsAutoPtr<WidgetPointerEvent> newPointerEvent;
     newPointerEvent =
       new WidgetPointerEvent(aMouseEvent->mFlags.mIsTrusted, aMessage,
                              aMouseEvent->widget);
     newPointerEvent->isPrimary = sourcePointer->isPrimary;
     newPointerEvent->pointerId = sourcePointer->pointerId;
     newPointerEvent->width = sourcePointer->width;
     newPointerEvent->height = sourcePointer->height;
@@ -3639,17 +3641,18 @@ EventStateManager::DispatchMouseOrPointe
                                   aRelatedContent, dispatchEvent);
 
   nsWeakFrame previousTarget = mCurrentTarget;
   mCurrentTargetContent = aTargetContent;
 
   nsIFrame* targetFrame = nullptr;
 
   if (aMouseEvent->AsMouseEvent()) {
-    PROFILER_LABEL("Input", "DispatchMouseEvent");
+    PROFILER_LABEL("Input", "DispatchMouseEvent",
+      js::ProfileEntry::Category::EVENTS);
   }
 
   nsEventStatus status = nsEventStatus_eIgnore;
   ESMEventCB callback(aTargetContent);
   EventDispatcher::Dispatch(aTargetContent, mPresContext, dispatchEvent, nullptr,
                             &status, &callback);
 
   if (mPresContext) {

--- a/dom/indexedDB/AsyncConnectionHelper.cpp
+++ b/dom/indexedDB/AsyncConnectionHelper.cpp
@@ -184,17 +184,18 @@ AsyncConnectionHelper::~AsyncConnectionH
 
 NS_IMPL_ISUPPORTS(AsyncConnectionHelper, nsIRunnable,
                   mozIStorageProgressHandler)
 
 NS_IMETHODIMP
 AsyncConnectionHelper::Run()
 {
   if (NS_IsMainThread()) {
-    PROFILER_MAIN_THREAD_LABEL("IndexedDB", "AsyncConnectionHelper::Run");
+    PROFILER_MAIN_THREAD_LABEL("AsyncConnectionHelper", "Run",
+      js::ProfileEntry::Category::STORAGE);
 
     if (mTransaction &&
         mTransaction->IsAborted()) {
       // Always fire a "error" event with ABORT_ERR if the transaction was
       // aborted, even if the request succeeded or failed with another error.
       mResultCode = NS_ERROR_DOM_INDEXEDDB_ABORT_ERR;
     }
 
@@ -266,17 +267,18 @@ AsyncConnectionHelper::Run()
     NS_ASSERTION(!(mDatabase || mTransaction || mRequest), "Subclass didn't "
                  "call AsyncConnectionHelper::ReleaseMainThreadObjects!");
 
     return NS_OK;
   }
 
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "AsyncConnectionHelper::Run");
+  PROFILER_LABEL("AsyncConnectionHelper", "Run",
+    js::ProfileEntry::Category::STORAGE);
 
   IDB_PROFILER_MARK_IF(mRequest,
                        "IndexedDB Request %llu: Beginning database work",
                        "IDBRequest[%llu] DT Start",
                        mRequest->GetSerialNumber());
 
   nsresult rv = NS_OK;
   nsCOMPtr<mozIStorageConnection> connection;
@@ -447,17 +449,18 @@ AsyncConnectionHelper::CreateSuccessEven
 }
 
 nsresult
 AsyncConnectionHelper::OnSuccess()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(mRequest, "Null request!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB", "AsyncConnectionHelper::OnSuccess");
+  PROFILER_MAIN_THREAD_LABEL("AsyncConnectionHelper", "OnSuccess",
+    js::ProfileEntry::Category::STORAGE);
 
   nsRefPtr<nsIDOMEvent> event = CreateSuccessEvent(mRequest);
   if (!event) {
     IDB_WARNING("Failed to create event!");
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
   }
 
   bool dummy;
@@ -483,17 +486,18 @@ AsyncConnectionHelper::OnSuccess()
 }
 
 void
 AsyncConnectionHelper::OnError()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(mRequest, "Null request!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB", "AsyncConnectionHelper::OnError");
+  PROFILER_MAIN_THREAD_LABEL("AsyncConnectionHelper", "OnError",
+    js::ProfileEntry::Category::STORAGE);
 
   // Make an error event and fire it at the target.
   nsRefPtr<nsIDOMEvent> event =
     CreateGenericEvent(mRequest, NS_LITERAL_STRING(ERROR_EVT_STR), eDoesBubble,
                        eCancelable);
   if (!event) {
     NS_ERROR("Failed to create event!");
     return;

--- a/dom/indexedDB/IDBCursor.cpp
+++ b/dom/indexedDB/IDBCursor.cpp
@@ -978,17 +978,18 @@ CursorHelper::ReleaseMainThreadObjects()
   AsyncConnectionHelper::ReleaseMainThreadObjects();
 }
 
 nsresult
 CursorHelper::Dispatch(nsIEventTarget* aDatabaseThread)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB", "CursorHelper::Dispatch");
+  PROFILER_MAIN_THREAD_LABEL("CursorHelper", "Dispatch",
+    js::ProfileEntry::Category::STORAGE);
 
   if (IndexedDatabaseManager::IsMainProcess()) {
     return AsyncConnectionHelper::Dispatch(aDatabaseThread);
   }
 
   // If we've been invalidated then there's no point sending anything to the
   // parent process.
   if (mCursor->Transaction()->Database()->IsInvalidated()) {
@@ -1014,17 +1015,18 @@ CursorHelper::Dispatch(nsIEventTarget* a
 }
 
 nsresult
 ContinueHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "ContinueHelper::DoDatabaseWork");
+  PROFILER_LABEL("ContinueHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   // We need to pick a query based on whether or not the cursor's mContinueToKey
   // is set. If it is unset then othing was passed to continue so we'll grab the
   // next item in the database that is greater than (less than, if we're running
   // a PREV cursor) the current key. If it is set then a key was passed to
   // continue so we'll grab the next item in the database that is greater than
   // (less than, if we're running a PREV cursor) or equal to the key that was
   // specified.
@@ -1096,36 +1098,36 @@ ContinueHelper::ReleaseMainThreadObjects
 }
 
 nsresult
 ContinueHelper::PackArgumentsForParentProcess(CursorRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "ContinueHelper::PackArgumentsForParentProcess");
+  PROFILER_MAIN_THREAD_LABEL("ContinueHelper", "PackArgumentsForParentProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   ContinueParams params;
 
   params.key() = mCursor->mContinueToKey;
   params.count() = uint32_t(mCount);
 
   aParams = params;
   return NS_OK;
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 ContinueHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "ContinueHelper::SendResponseToChildProcess");
+  PROFILER_MAIN_THREAD_LABEL("ContinueHelper", "SendResponseToChildProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   InfallibleTArray<PBlobParent*> blobsParent;
 
   if (NS_SUCCEEDED(aResultCode)) {
     IDBDatabase* database = mTransaction->Database();

--- a/dom/indexedDB/IDBDatabase.cpp
+++ b/dom/indexedDB/IDBDatabase.cpp
@@ -797,17 +797,18 @@ NoRequestDatabaseHelper::OnError()
 }
 
 nsresult
 CreateObjectStoreHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "CreateObjectStoreHelper::DoDatabaseWork");
+  PROFILER_LABEL("CreateObjectStoreHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   if (IndexedDatabaseManager::InLowDiskSpaceMode()) {
     NS_WARNING("Refusing to create additional objectStore because disk space "
                "is low!");
     return NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR;
   }
 
   nsCOMPtr<mozIStorageStatement> stmt =
@@ -857,17 +858,18 @@ CreateObjectStoreHelper::ReleaseMainThre
 }
 
 nsresult
 DeleteObjectStoreHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "DeleteObjectStoreHelper::DoDatabaseWork");
+  PROFILER_LABEL("DeleteObjectStoreHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCOMPtr<mozIStorageStatement> stmt =
     mTransaction->GetCachedStatement(NS_LITERAL_CSTRING(
     "DELETE FROM object_store "
     "WHERE id = :id "
   ));
   IDB_ENSURE_TRUE(stmt, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
 
@@ -883,17 +885,18 @@ DeleteObjectStoreHelper::DoDatabaseWork(
 }
 
 nsresult
 CreateFileHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "CreateFileHelper::DoDatabaseWork");
+  PROFILER_LABEL("CreateFileHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   if (IndexedDatabaseManager::InLowDiskSpaceMode()) {
     NS_WARNING("Refusing to create file because disk space is low!");
     return NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR;
   }
 
   FileManager* fileManager = mDatabase->Manager();
 

--- a/dom/indexedDB/IDBIndex.cpp
+++ b/dom/indexedDB/IDBIndex.cpp
@@ -1028,17 +1028,18 @@ IndexHelper::ReleaseMainThreadObjects()
   AsyncConnectionHelper::ReleaseMainThreadObjects();
 }
 
 nsresult
 IndexHelper::Dispatch(nsIEventTarget* aDatabaseThread)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB", "IndexHelper::Dispatch");
+  PROFILER_MAIN_THREAD_LABEL("IndexHelper", "Dispatch",
+    js::ProfileEntry::Category::STORAGE);
 
   if (IndexedDatabaseManager::IsMainProcess()) {
     return AsyncConnectionHelper::Dispatch(aDatabaseThread);
   }
 
   // If we've been invalidated then there's no point sending anything to the
   // parent process.
   if (mIndex->ObjectStore()->Transaction()->Database()->IsInvalidated()) {
@@ -1065,17 +1066,18 @@ IndexHelper::Dispatch(nsIEventTarget* aD
 
 nsresult
 GetKeyHelper::DoDatabaseWork(mozIStorageConnection* /* aConnection */)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(mKeyRange, "Must have a key range here!");
 
-  PROFILER_LABEL("IndexedDB", "GetKeyHelper::DoDatabaseWork");
+  PROFILER_LABEL("GetKeyHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCString indexTable;
   if (mIndex->IsUnique()) {
     indexTable.AssignLiteral("unique_index_data");
   }
   else {
     indexTable.AssignLiteral("index_data");
   }
@@ -1131,35 +1133,35 @@ GetKeyHelper::ReleaseMainThreadObjects()
 
 nsresult
 GetKeyHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(mKeyRange, "This should never be null!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetKeyHelper::PackArgumentsForParentProcess");
+  PROFILER_MAIN_THREAD_LABEL("GetKeyHelper", "PackArgumentsForParentProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   GetKeyParams params;
 
   mKeyRange->ToSerializedKeyRange(params.keyRange());
 
   aParams = params;
   return NS_OK;
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 GetKeyHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetKeyHelper::SendResponseToChildProcess");
+  PROFILER_MAIN_THREAD_LABEL("GetKeyHelper", "SendResponseToChildProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   ResponseValue response;
   if (NS_FAILED(aResultCode)) {
     response = aResultCode;
   }
@@ -1189,17 +1191,18 @@ GetKeyHelper::UnpackResponseFromParentPr
 
 nsresult
 GetHelper::DoDatabaseWork(mozIStorageConnection* /* aConnection */)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(mKeyRange, "Must have a key range here!");
 
-  PROFILER_LABEL("IndexedDB", "GetHelper::DoDatabaseWork [IDBIndex.cpp]");
+  PROFILER_LABEL("GetHelper", "DoDatabaseWork [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCString indexTable;
   if (mIndex->IsUnique()) {
     indexTable.AssignLiteral("unique_index_data");
   }
   else {
     indexTable.AssignLiteral("index_data");
   }
@@ -1263,37 +1266,35 @@ GetHelper::ReleaseMainThreadObjects()
 
 nsresult
 GetHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(mKeyRange, "This should never be null!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetHelper::PackArgumentsForParentProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetHelper", "PackArgumentsForParentProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   GetParams params;
 
   mKeyRange->ToSerializedKeyRange(params.keyRange());
 
   aParams = params;
   return NS_OK;
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 GetHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetHelper::SendResponseToChildProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetHelper", "SendResponseToChildProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   InfallibleTArray<PBlobParent*> blobsParent;
 
   if (NS_SUCCEEDED(aResultCode)) {
     IDBDatabase* database = mIndex->ObjectStore()->Transaction()->Database();
@@ -1357,18 +1358,18 @@ GetHelper::UnpackResponseFromParentProce
 }
 
 nsresult
 GetAllKeysHelper::DoDatabaseWork(mozIStorageConnection* /* aConnection */)
 {
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(IndexedDatabaseManager::IsMainProcess());
 
-  PROFILER_LABEL("IndexedDB",
-                 "GetAllKeysHelper::DoDatabaseWork [IDBIndex.cpp]");
+  PROFILER_LABEL("GetAllKeysHelper", "DoDatabaseWork [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCString tableName;
   if (mIndex->IsUnique()) {
     tableName.AssignLiteral("unique_index_data");
   }
   else {
     tableName.AssignLiteral("index_data");
   }
@@ -1424,19 +1425,18 @@ GetAllKeysHelper::DoDatabaseWork(mozISto
 
 nsresult
 GetAllKeysHelper::GetSuccessResult(JSContext* aCx,
                                    JS::MutableHandle<JS::Value> aVal)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mKeys.Length() <= mLimit);
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllKeysHelper::GetSuccessResult "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllKeysHelper", "GetSuccessResult [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   nsTArray<Key> keys;
   mKeys.SwapElements(keys);
 
   JS::Rooted<JSObject*> array(aCx, JS_NewArrayObject(aCx, 0));
   if (!array) {
     IDB_WARNING("Failed to make array!");
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
@@ -1471,19 +1471,18 @@ GetAllKeysHelper::GetSuccessResult(JSCon
 }
 
 nsresult
 GetAllKeysHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!IndexedDatabaseManager::IsMainProcess());
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllKeysHelper::PackArgumentsForParentProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllKeysHelper", "PackArgumentsForParentProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   GetAllKeysParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   }
@@ -1498,19 +1497,18 @@ GetAllKeysHelper::PackArgumentsForParent
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 GetAllKeysHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(IndexedDatabaseManager::IsMainProcess());
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllKeysHelper::SendResponseToChildProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllKeysHelper", "SendResponseToChildProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   ResponseValue response;
   if (NS_FAILED(aResultCode)) {
     response = aResultCode;
   }
@@ -1540,17 +1538,18 @@ GetAllKeysHelper::UnpackResponseFromPare
 }
 
 nsresult
 GetAllHelper::DoDatabaseWork(mozIStorageConnection* /* aConnection */)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "GetAllHelper::DoDatabaseWork [IDBIndex.cpp]");
+  PROFILER_LABEL("GetAllHelper", "DoDatabaseWork [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCString indexTable;
   if (mIndex->IsUnique()) {
     indexTable.AssignLiteral("unique_index_data");
   }
   else {
     indexTable.AssignLiteral("index_data");
   }
@@ -1632,19 +1631,18 @@ GetAllHelper::ReleaseMainThreadObjects()
 }
 
 nsresult
 GetAllHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllHelper::PackArgumentsForParentProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllHelper", "PackArgumentsForParentProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   GetAllParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   }
@@ -1659,19 +1657,18 @@ GetAllHelper::PackArgumentsForParentProc
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 GetAllHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllHelper::SendResponseToChildProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllHelper", "SendResponseToChildProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   GetAllResponse getAllResponse;
 
   if (NS_SUCCEEDED(aResultCode) && !mCloneReadInfos.IsEmpty()) {
     IDBDatabase* database = mIndex->ObjectStore()->Transaction()->Database();
@@ -1765,17 +1762,18 @@ GetAllHelper::UnpackResponseFromParentPr
 
 nsresult
 OpenKeyCursorHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(aConnection, "Passed a null connection!");
 
-  PROFILER_LABEL("IndexedDB", "OpenKeyCursorHelper::DoDatabaseWork");
+  PROFILER_LABEL("OpenKeyCursorHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCString table;
   if (mIndex->IsUnique()) {
     table.AssignLiteral("unique_index_data");
   }
   else {
     table.AssignLiteral("index_data");
   }
@@ -1974,19 +1972,18 @@ OpenKeyCursorHelper::ReleaseMainThreadOb
 }
 
 nsresult
 OpenKeyCursorHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenKeyCursorHelper::"
-                             "PackArgumentsForParentProcess [IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenKeyCursorHelper", "PackArgumentsForParentProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   OpenKeyCursorParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   }
@@ -2002,18 +1999,18 @@ OpenKeyCursorHelper::PackArgumentsForPar
 
 AsyncConnectionHelper::ChildProcessSendResult
 OpenKeyCursorHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(!mCursor, "Shouldn't have this yet!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenKeyCursorHelper::SendResponseToChildProcess");
+  PROFILER_MAIN_THREAD_LABEL("OpenKeyCursorHelper", "SendResponseToChildProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   if (NS_SUCCEEDED(aResultCode)) {
     nsresult rv = EnsureCursor();
     if (NS_FAILED(rv)) {
       NS_WARNING("EnsureCursor failed!");
@@ -2099,18 +2096,18 @@ OpenKeyCursorHelper::UnpackResponseFromP
 
 nsresult
 OpenCursorHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(aConnection, "Passed a null connection!");
 
-  PROFILER_LABEL("IndexedDB",
-                 "OpenCursorHelper::DoDatabaseWork [IDBIndex.cpp]");
+  PROFILER_LABEL("OpenCursorHelper", "DoDatabaseWork [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCString indexTable;
   if (mIndex->IsUnique()) {
     indexTable.AssignLiteral("unique_index_data");
   }
   else {
     indexTable.AssignLiteral("index_data");
   }
@@ -2317,19 +2314,18 @@ OpenCursorHelper::ReleaseMainThreadObjec
 }
 
 nsresult
 OpenCursorHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenCursorHelper::PackArgumentsForParentProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenCursorHelper", "PackArgumentsForParentProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   OpenCursorParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   }
@@ -2345,19 +2341,18 @@ OpenCursorHelper::PackArgumentsForParent
 
 AsyncConnectionHelper::ChildProcessSendResult
 OpenCursorHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(!mCursor, "Shouldn't have this yet!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenCursorHelper::SendResponseToChildProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenCursorHelper", "SendResponseToChildProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   InfallibleTArray<PBlobParent*> blobsParent;
 
   if (NS_SUCCEEDED(aResultCode)) {
     IDBDatabase* database = mIndex->ObjectStore()->Transaction()->Database();
@@ -2432,17 +2427,18 @@ OpenCursorHelper::SendResponseToChildPro
 }
 
 nsresult
 CountHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "CountHelper::DoDatabaseWork [IDBIndex.cpp]");
+  PROFILER_LABEL("CountHelper", "DoDatabaseWork [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCString table;
   if (mIndex->IsUnique()) {
     table.AssignLiteral("unique_index_data");
   }
   else {
     table.AssignLiteral("index_data");
   }
@@ -2511,19 +2507,18 @@ CountHelper::ReleaseMainThreadObjects()
 }
 
 nsresult
 CountHelper::PackArgumentsForParentProcess(IndexRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "CountHelper::PackArgumentsForParentProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("CountHelper", "PackArgumentsForParentProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   CountParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   }
@@ -2536,19 +2531,18 @@ CountHelper::PackArgumentsForParentProce
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 CountHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "CountHelper::SendResponseToChildProcess "
-                             "[IDBIndex.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("CountHelper", "SendResponseToChildProcess [IDBIndex.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   ResponseValue response;
   if (NS_FAILED(aResultCode)) {
     response = aResultCode;
   }

--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -1076,17 +1076,18 @@ IDBObjectStore::UpdateIndexes(IDBTransac
                               const Key& aObjectStoreKey,
                               bool aOverwrite,
                               int64_t aObjectDataId,
                               const nsTArray<IndexUpdateInfo>& aUpdateInfoArray)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "IDBObjectStore::UpdateIndexes");
+  PROFILER_LABEL("IDBObjectStore", "UpdateIndexes",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv;
 
   NS_ASSERTION(aObjectDataId != INT64_MIN, "Bad objectData id!");
 
   NS_NAMED_LITERAL_CSTRING(objectDataId, "object_data_id");
 
   if (aOverwrite) {
@@ -1181,18 +1182,18 @@ IDBObjectStore::GetStructuredCloneReadIn
                                            uint32_t aDataIndex,
                                            uint32_t aFileIdsIndex,
                                            IDBDatabase* aDatabase,
                                            StructuredCloneReadInfo& aInfo)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB",
-                 "IDBObjectStore::GetStructuredCloneReadInfoFromStatement");
+  PROFILER_LABEL("IDBObjectStore", "GetStructuredCloneReadInfoFromStatement",
+    js::ProfileEntry::Category::STORAGE);
 
 #ifdef DEBUG
   {
     int32_t type;
     NS_ASSERTION(NS_SUCCEEDED(aStatement->GetTypeOfIndex(aDataIndex, &type)) &&
                  type == mozIStorageStatement::VALUE_TYPE_BLOB,
                  "Bad value type!");
   }
@@ -2972,17 +2973,18 @@ IDBObjectStore::OpenKeyCursor(JSContext*
 }
 
 inline nsresult
 CopyData(nsIInputStream* aInputStream, nsIOutputStream* aOutputStream)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "CopyData");
+  PROFILER_LABEL("IDBObjectStore", "CopyData",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv;
 
   do {
     char copyBuffer[FILE_COPY_BUFFER_SIZE];
 
     uint32_t numRead;
     rv = aInputStream->Read(copyBuffer, sizeof(copyBuffer), &numRead);
@@ -3015,17 +3017,18 @@ ObjectStoreHelper::ReleaseMainThreadObje
   AsyncConnectionHelper::ReleaseMainThreadObjects();
 }
 
 nsresult
 ObjectStoreHelper::Dispatch(nsIEventTarget* aDatabaseThread)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB", "ObjectStoreHelper::Dispatch");
+  PROFILER_MAIN_THREAD_LABEL("ObjectStoreHelper", "Dispatch",
+    js::ProfileEntry::Category::STORAGE);
 
   if (IndexedDatabaseManager::IsMainProcess()) {
     return AsyncConnectionHelper::Dispatch(aDatabaseThread);
   }
 
   // If we've been invalidated then there's no point sending anything to the
   // parent process.
   if (mObjectStore->Transaction()->Database()->IsInvalidated()) {
@@ -3101,17 +3104,18 @@ ReinterpretDoubleAsUInt64(double d)
 
 nsresult
 AddHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(aConnection, "Passed a null connection!");
 
-  PROFILER_LABEL("IndexedDB", "AddHelper::DoDatabaseWork");
+  PROFILER_LABEL("AddHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   if (IndexedDatabaseManager::InLowDiskSpaceMode()) {
     NS_WARNING("Refusing to add more data because disk space is low!");
     return NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR;
   }
 
   nsresult rv;
   bool keyUnset = mKey.IsUnset();
@@ -3316,18 +3320,18 @@ AddHelper::ReleaseMainThreadObjects()
 }
 
 nsresult
 AddHelper::PackArgumentsForParentProcess(ObjectStoreRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "AddHelper::PackArgumentsForParentProcess");
+  PROFILER_MAIN_THREAD_LABEL("AddHelper", "PackArgumentsForParentProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   AddPutParams commonParams;
   commonParams.cloneInfo() = mCloneWriteInfo;
   commonParams.key() = mKey;
   commonParams.indexUpdateInfos().AppendElements(mIndexUpdateInfo);
 
   const nsTArray<StructuredCloneFile>& files = mCloneWriteInfo.mFiles;
 
@@ -3371,18 +3375,18 @@ AddHelper::PackArgumentsForParentProcess
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 AddHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "AddHelper::SendResponseToChildProcess");
+  PROFILER_MAIN_THREAD_LABEL("AddHelper", "SendResponseToChildProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   ResponseValue response;
   if (NS_FAILED(aResultCode)) {
     response =  aResultCode;
   }
@@ -3420,17 +3424,18 @@ AddHelper::UnpackResponseFromParentProce
 
 nsresult
 GetHelper::DoDatabaseWork(mozIStorageConnection* /* aConnection */)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(mKeyRange, "Must have a key range here!");
 
-  PROFILER_LABEL("IndexedDB", "GetHelper::DoDatabaseWork [IDBObjectStore.cpp]");
+  PROFILER_LABEL("GetHelper", "DoDatabaseWork [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCString keyRangeClause;
   mKeyRange->GetBindingClause(NS_LITERAL_CSTRING("key_value"), keyRangeClause);
 
   NS_ASSERTION(!keyRangeClause.IsEmpty(), "Huh?!");
 
   nsCString query = NS_LITERAL_CSTRING("SELECT data, file_ids FROM object_data "
                                        "WHERE object_store_id = :osid") +
@@ -3483,37 +3488,35 @@ GetHelper::ReleaseMainThreadObjects()
 
 nsresult
 GetHelper::PackArgumentsForParentProcess(ObjectStoreRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(mKeyRange, "This should never be null!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetHelper::PackArgumentsForParentProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetHelper", "PackArgumentsForParentProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   GetParams params;
 
   mKeyRange->ToSerializedKeyRange(params.keyRange());
 
   aParams = params;
   return NS_OK;
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 GetHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetHelper::SendResponseToChildProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetHelper", "SendResponseToChildProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   InfallibleTArray<PBlobParent*> blobsParent;
 
   if (NS_SUCCEEDED(aResultCode)) {
     IDBDatabase* database = mObjectStore->Transaction()->Database();
@@ -3578,17 +3581,18 @@ GetHelper::UnpackResponseFromParentProce
 
 nsresult
 DeleteHelper::DoDatabaseWork(mozIStorageConnection* /*aConnection */)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(mKeyRange, "Must have a key range here!");
 
-  PROFILER_LABEL("IndexedDB", "DeleteHelper::DoDatabaseWork");
+  PROFILER_LABEL("DeleteHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCString keyRangeClause;
   mKeyRange->GetBindingClause(NS_LITERAL_CSTRING("key_value"), keyRangeClause);
 
   NS_ASSERTION(!keyRangeClause.IsEmpty(), "Huh?!");
 
   nsCString query = NS_LITERAL_CSTRING("DELETE FROM object_data "
                                        "WHERE object_store_id = :osid") +
@@ -3622,35 +3626,35 @@ DeleteHelper::GetSuccessResult(JSContext
 
 nsresult
 DeleteHelper::PackArgumentsForParentProcess(ObjectStoreRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(mKeyRange, "This should never be null!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "DeleteHelper::PackArgumentsForParentProcess");
+  PROFILER_MAIN_THREAD_LABEL("DeleteHelper", "PackArgumentsForParentProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   DeleteParams params;
 
   mKeyRange->ToSerializedKeyRange(params.keyRange());
 
   aParams = params;
   return NS_OK;
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 DeleteHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "DeleteHelper::SendResponseToChildProcess");
+  PROFILER_MAIN_THREAD_LABEL("DeleteHelper", "SendResponseToChildProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   ResponseValue response;
   if (NS_FAILED(aResultCode)) {
     response = aResultCode;
   }
@@ -3677,17 +3681,18 @@ DeleteHelper::UnpackResponseFromParentPr
 
 nsresult
 ClearHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(aConnection, "Passed a null connection!");
 
-  PROFILER_LABEL("IndexedDB", "ClearHelper::DoDatabaseWork");
+  PROFILER_LABEL("ClearHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCOMPtr<mozIStorageStatement> stmt =
     mTransaction->GetCachedStatement(
       NS_LITERAL_CSTRING("DELETE FROM object_data "
                          "WHERE object_store_id = :osid"));
   IDB_ENSURE_TRUE(stmt, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
 
   mozStorageStatementScoper scoper(stmt);
@@ -3703,31 +3708,31 @@ ClearHelper::DoDatabaseWork(mozIStorageC
 }
 
 nsresult
 ClearHelper::PackArgumentsForParentProcess(ObjectStoreRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "ClearHelper::PackArgumentsForParentProcess");
+  PROFILER_MAIN_THREAD_LABEL("ClearHelper", "PackArgumentsForParentProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   aParams = ClearParams();
   return NS_OK;
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 ClearHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "ClearHelper::SendResponseToChildProcess");
+  PROFILER_MAIN_THREAD_LABEL("ClearHelper", "SendResponseToChildProcess",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   ResponseValue response;
   if (NS_FAILED(aResultCode)) {
     response = aResultCode;
   }
@@ -3753,18 +3758,18 @@ ClearHelper::UnpackResponseFromParentPro
 }
 
 nsresult
 OpenCursorHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB",
-                 "OpenCursorHelper::DoDatabaseWork [IDBObjectStore.cpp]");
+  PROFILER_LABEL("OpenCursorHelper", "DoDatabaseWork [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   NS_NAMED_LITERAL_CSTRING(keyValue, "key_value");
 
   nsCString keyRangeClause;
   if (mKeyRange) {
     mKeyRange->GetBindingClause(keyValue, keyRangeClause);
   }
 
@@ -3938,19 +3943,18 @@ OpenCursorHelper::ReleaseMainThreadObjec
 
 nsresult
 OpenCursorHelper::PackArgumentsForParentProcess(
                                               ObjectStoreRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenCursorHelper::PackArgumentsForParentProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenCursorHelper", "PackArgumentsForParentProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   OpenCursorParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   }
@@ -3966,19 +3970,18 @@ OpenCursorHelper::PackArgumentsForParent
 
 AsyncConnectionHelper::ChildProcessSendResult
 OpenCursorHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(!mCursor, "Shouldn't have this yet!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenCursorHelper::SendResponseToChildProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenCursorHelper", "SendResponseToChildProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   InfallibleTArray<PBlobParent*> blobsParent;
 
   if (NS_SUCCEEDED(aResultCode)) {
     IDBDatabase* database = mObjectStore->Transaction()->Database();
@@ -4090,18 +4093,18 @@ OpenCursorHelper::UnpackResponseFromPare
 }
 
 nsresult
 OpenKeyCursorHelper::DoDatabaseWork(mozIStorageConnection* /* aConnection */)
 {
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(IndexedDatabaseManager::IsMainProcess());
 
-  PROFILER_LABEL("IndexedDB",
-                 "OpenKeyCursorHelper::DoDatabaseWork [IDBObjectStore.cpp]");
+  PROFILER_LABEL("OpenKeyCursorHelper", "DoDatabaseWork [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   NS_NAMED_LITERAL_CSTRING(keyValue, "key_value");
   NS_NAMED_LITERAL_CSTRING(id, "id");
   NS_NAMED_LITERAL_CSTRING(openLimit, " LIMIT ");
 
   nsAutoCString queryStart = NS_LITERAL_CSTRING("SELECT ") + keyValue +
                              NS_LITERAL_CSTRING(" FROM object_data WHERE "
                                                 "object_store_id = :") +
@@ -4207,19 +4210,18 @@ OpenKeyCursorHelper::DoDatabaseWork(mozI
   return NS_OK;
 }
 
 nsresult
 OpenKeyCursorHelper::EnsureCursor()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenKeyCursorHelper::EnsureCursor "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenKeyCursorHelper", "EnsureCursor [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   if (mCursor || mKey.IsUnset()) {
     return NS_OK;
   }
 
   mCursor = IDBCursor::Create(mRequest, mTransaction, mObjectStore, mDirection,
                               mRangeKey, mContinueQuery, mContinueToQuery,
                               mKey);
@@ -4229,19 +4231,18 @@ OpenKeyCursorHelper::EnsureCursor()
 }
 
 nsresult
 OpenKeyCursorHelper::GetSuccessResult(JSContext* aCx,
                                       JS::MutableHandle<JS::Value> aVal)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenKeyCursorHelper::GetSuccessResult "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenKeyCursorHelper", "GetSuccessResult [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv = EnsureCursor();
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (mCursor) {
     rv = WrapNative(aCx, mCursor, aVal);
     IDB_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
   }
@@ -4265,20 +4266,18 @@ OpenKeyCursorHelper::ReleaseMainThreadOb
 
 nsresult
 OpenKeyCursorHelper::PackArgumentsForParentProcess(
                                               ObjectStoreRequestParams& aParams)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!IndexedDatabaseManager::IsMainProcess());
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenKeyCursorHelper::"
-                             "PackArgumentsForParentProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenKeyCursorHelper", "PackArgumentsForParentProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   OpenKeyCursorParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   }
@@ -4294,19 +4293,18 @@ OpenKeyCursorHelper::PackArgumentsForPar
 
 AsyncConnectionHelper::ChildProcessSendResult
 OpenKeyCursorHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(IndexedDatabaseManager::IsMainProcess());
   MOZ_ASSERT(!mCursor);
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenKeyCursorHelper::SendResponseToChildProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenKeyCursorHelper", "SendResponseToChildProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   MOZ_ASSERT(actor);
 
   if (NS_SUCCEEDED(aResultCode)) {
     nsresult rv = EnsureCursor();
     if (NS_FAILED(rv)) {
       NS_WARNING("EnsureCursor failed!");
@@ -4360,20 +4358,18 @@ OpenKeyCursorHelper::UnpackResponseFromP
   MOZ_ASSERT(!IndexedDatabaseManager::IsMainProcess());
   MOZ_ASSERT(aResponseValue.type() == ResponseValue::TOpenCursorResponse);
   MOZ_ASSERT(aResponseValue.get_OpenCursorResponse().type() ==
                OpenCursorResponse::Tvoid_t ||
              aResponseValue.get_OpenCursorResponse().type() ==
                OpenCursorResponse::TPIndexedDBCursorChild);
   MOZ_ASSERT(!mCursor);
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenKeyCursorHelper::"
-                             "UnpackResponseFromParentProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("OpenKeyCursorHelper", "UnpackResponseFromParentProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   const OpenCursorResponse& response =
     aResponseValue.get_OpenCursorResponse();
 
   switch (response.type()) {
     case OpenCursorResponse::Tvoid_t:
       break;
 
@@ -4395,17 +4391,18 @@ OpenKeyCursorHelper::UnpackResponseFromP
 }
 
 nsresult
 CreateIndexHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "CreateIndexHelper::DoDatabaseWork");
+  PROFILER_LABEL("CreateIndexHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   if (IndexedDatabaseManager::InLowDiskSpaceMode()) {
     NS_WARNING("Refusing to create index because disk space is low!");
     return NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR;
   }
 
   // Insert the data into the database.
   nsCOMPtr<mozIStorageStatement> stmt =
@@ -4566,17 +4563,18 @@ CreateIndexHelper::DestroyTLSEntry(void*
 }
 
 nsresult
 DeleteIndexHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "DeleteIndexHelper::DoDatabaseWork");
+  PROFILER_LABEL("DeleteIndexHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCOMPtr<mozIStorageStatement> stmt =
     mTransaction->GetCachedStatement(
       "DELETE FROM object_store_index "
       "WHERE name = :name "
     );
   IDB_ENSURE_TRUE(stmt, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
 
@@ -4593,18 +4591,18 @@ DeleteIndexHelper::DoDatabaseWork(mozISt
 }
 
 nsresult
 GetAllHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB",
-                 "GetAllHelper::DoDatabaseWork [IDBObjectStore.cpp]");
+  PROFILER_LABEL("GetAllHelper", "DoDatabaseWork [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   NS_NAMED_LITERAL_CSTRING(lowerKeyName, "lower_key");
   NS_NAMED_LITERAL_CSTRING(upperKeyName, "upper_key");
 
   nsAutoCString keyRangeClause;
   if (mKeyRange) {
     if (!mKeyRange->Lower().IsUnset()) {
       keyRangeClause = NS_LITERAL_CSTRING(" AND key_value");
@@ -4707,19 +4705,18 @@ GetAllHelper::ReleaseMainThreadObjects()
 }
 
 nsresult
 GetAllHelper::PackArgumentsForParentProcess(ObjectStoreRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllHelper::PackArgumentsForParentProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllHelper", "PackArgumentsForParentProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   GetAllParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   }
@@ -4734,19 +4731,18 @@ GetAllHelper::PackArgumentsForParentProc
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 GetAllHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllHelper::SendResponseToChildProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllHelper", "SendResponseToChildProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   GetAllResponse getAllResponse;
   if (NS_SUCCEEDED(aResultCode) && !mCloneReadInfos.IsEmpty()) {
     IDBDatabase* database = mObjectStore->Transaction()->Database();
     NS_ASSERTION(database, "This should never be null!");
@@ -4835,18 +4831,18 @@ GetAllHelper::UnpackResponseFromParentPr
 }
 
 nsresult
 GetAllKeysHelper::DoDatabaseWork(mozIStorageConnection* /* aConnection */)
 {
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(IndexedDatabaseManager::IsMainProcess());
 
-  PROFILER_LABEL("IndexedDB",
-                 "GetAllKeysHelper::DoDatabaseWork [IDObjectStore.cpp]");
+  PROFILER_LABEL("GetAllKeysHelper", "DoDatabaseWork [IDObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   NS_NAMED_LITERAL_CSTRING(keyValue, "key_value");
 
   nsAutoCString keyRangeClause;
   if (mKeyRange) {
     mKeyRange->GetBindingClause(keyValue, keyRangeClause);
   }
 
@@ -4899,19 +4895,18 @@ GetAllKeysHelper::DoDatabaseWork(mozISto
 
 nsresult
 GetAllKeysHelper::GetSuccessResult(JSContext* aCx,
                                    JS::MutableHandle<JS::Value> aVal)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mKeys.Length() <= mLimit);
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllKeysHelper::GetSuccessResult "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllKeysHelper", "GetSuccessResult [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   nsTArray<Key> keys;
   mKeys.SwapElements(keys);
 
   JS::Rooted<JSObject*> array(aCx, JS_NewArrayObject(aCx, 0));
   if (!array) {
     IDB_WARNING("Failed to make array!");
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
@@ -4957,19 +4952,18 @@ GetAllKeysHelper::ReleaseMainThreadObjec
 
 nsresult
 GetAllKeysHelper::PackArgumentsForParentProcess(
                                               ObjectStoreRequestParams& aParams)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!IndexedDatabaseManager::IsMainProcess());
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllKeysHelper::PackArgumentsForParentProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllKeysHelper", "PackArgumentsForParentProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   GetAllKeysParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   } else {
@@ -4983,19 +4977,18 @@ GetAllKeysHelper::PackArgumentsForParent
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 GetAllKeysHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(IndexedDatabaseManager::IsMainProcess());
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "GetAllKeysHelper::SendResponseToChildProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("GetAllKeysHelper", "SendResponseToChildProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   MOZ_ASSERT(actor);
 
   ResponseValue response;
   if (NS_FAILED(aResultCode)) {
     response = aResultCode;
   }
@@ -5025,18 +5018,18 @@ GetAllKeysHelper::UnpackResponseFromPare
 }
 
 nsresult
 CountHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB",
-                 "CountHelper::DoDatabaseWork [IDBObjectStore.cpp]");
+  PROFILER_LABEL("CountHelper", "DoDatabaseWork [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   NS_NAMED_LITERAL_CSTRING(lowerKeyName, "lower_key");
   NS_NAMED_LITERAL_CSTRING(upperKeyName, "upper_key");
 
   nsAutoCString keyRangeClause;
   if (mKeyRange) {
     if (!mKeyRange->Lower().IsUnset()) {
       keyRangeClause = NS_LITERAL_CSTRING(" AND key_value");
@@ -5110,19 +5103,18 @@ CountHelper::ReleaseMainThreadObjects()
 }
 
 nsresult
 CountHelper::PackArgumentsForParentProcess(ObjectStoreRequestParams& aParams)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "CountHelper::PackArgumentsForParentProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("CountHelper", "PackArgumentsForParentProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   CountParams params;
 
   if (mKeyRange) {
     KeyRange keyRange;
     mKeyRange->ToSerializedKeyRange(keyRange);
     params.optionalKeyRange() = keyRange;
   }
@@ -5135,19 +5127,18 @@ CountHelper::PackArgumentsForParentProce
 }
 
 AsyncConnectionHelper::ChildProcessSendResult
 CountHelper::SendResponseToChildProcess(nsresult aResultCode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "CountHelper::SendResponseToChildProcess "
-                             "[IDBObjectStore.cpp]");
+  PROFILER_MAIN_THREAD_LABEL("CountHelper", "SendResponseToChildProcess [IDBObjectStore.cpp]",
+    js::ProfileEntry::Category::STORAGE);
 
   IndexedDBRequestParentBase* actor = mRequest->GetActorParent();
   NS_ASSERTION(actor, "How did we get this far without an actor?");
 
   ResponseValue response;
   if (NS_FAILED(aResultCode)) {
     response = aResultCode;
   }

--- a/dom/indexedDB/IDBTransaction.cpp
+++ b/dom/indexedDB/IDBTransaction.cpp
@@ -368,17 +368,18 @@ IDBTransaction::RollbackSavepoint()
 }
 
 nsresult
 IDBTransaction::GetOrCreateConnection(mozIStorageConnection** aResult)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "IDBTransaction::GetOrCreateConnection");
+  PROFILER_LABEL("IDBTransaction", "GetOrCreateConnection",
+    js::ProfileEntry::Category::STORAGE);
 
   if (mDatabase->IsInvalidated()) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
   if (!mConnection) {
     nsCOMPtr<mozIStorageConnection> connection =
       IDBFactory::GetConnection(mDatabase->FilePath(), mDatabase->Type(),
@@ -787,17 +788,18 @@ CommitHelper::~CommitHelper()
 }
 
 NS_IMPL_ISUPPORTS(CommitHelper, nsIRunnable)
 
 NS_IMETHODIMP
 CommitHelper::Run()
 {
   if (NS_IsMainThread()) {
-    PROFILER_MAIN_THREAD_LABEL("IndexedDB", "CommitHelper::Run");
+    PROFILER_MAIN_THREAD_LABEL("CommitHelper", "Run",
+      js::ProfileEntry::Category::STORAGE);
 
     NS_ASSERTION(mDoomedObjects.IsEmpty(), "Didn't release doomed objects!");
 
     mTransaction->mReadyState = IDBTransaction::DONE;
 
     // Release file infos on the main thread, so they will eventually get
     // destroyed on correct thread.
     mTransaction->ClearCreatedFileInfos();
@@ -855,17 +857,18 @@ CommitHelper::Run()
       mListener->NotifyTransactionPostComplete(mTransaction);
     }
 
     mTransaction = nullptr;
 
     return NS_OK;
   }
 
-  PROFILER_LABEL("IndexedDB", "CommitHelper::Run");
+  PROFILER_LABEL("CommitHelper", "Run",
+    js::ProfileEntry::Category::STORAGE);
 
   IDBDatabase* database = mTransaction->Database();
   if (database->IsInvalidated()) {
     IDB_REPORT_INTERNAL_ERR();
     mAbortCode = NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
   }
 
   if (mConnection) {

--- a/dom/indexedDB/OpenDatabaseHelper.cpp
+++ b/dom/indexedDB/OpenDatabaseHelper.cpp
@@ -120,17 +120,18 @@ GetDatabaseFilename(const nsAString& aNa
 }
 
 nsresult
 CreateFileTables(mozIStorageConnection* aDBConn)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "CreateFileTables");
+  PROFILER_LABEL("OpenDatabaseHelper", "CreateFileTables",
+    js::ProfileEntry::Category::STORAGE);
 
   // Table `file`
   nsresult rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "CREATE TABLE file ("
       "id INTEGER PRIMARY KEY, "
       "refcount INTEGER NOT NULL"
     ");"
   ));
@@ -183,17 +184,18 @@ CreateFileTables(mozIStorageConnection* 
 
 nsresult
 CreateTables(mozIStorageConnection* aDBConn)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(aDBConn, "Passing a null database connection!");
 
-  PROFILER_LABEL("IndexedDB", "CreateTables");
+  PROFILER_LABEL("OpenDatabaseHelper", "CreateTables",
+    js::ProfileEntry::Category::STORAGE);
 
   // Table `database`
   nsresult rv = aDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "CREATE TABLE database ("
       "name TEXT NOT NULL, "
       "version INTEGER NOT NULL DEFAULT 0"
     ");"
   ));
@@ -299,17 +301,18 @@ CreateTables(mozIStorageConnection* aDBC
 }
 
 nsresult
 UpgradeSchemaFrom4To5(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom4To5");
+  PROFILER_LABEL("OpenDatabaseHelper", "UpgradeSchemaFrom4To5",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv;
 
   // All we changed is the type of the version column, so lets try to
   // convert that to an integer, and if we fail, set it to 0.
   nsCOMPtr<mozIStorageStatement> stmt;
   rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
     "SELECT name, version, dataVersion "
@@ -388,17 +391,18 @@ UpgradeSchemaFrom4To5(mozIStorageConnect
 }
 
 nsresult
 UpgradeSchemaFrom5To6(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom5To6");
+  PROFILER_LABEL("OpenDatabaseHelper", "UpgradeSchemaFrom5To6",
+    js::ProfileEntry::Category::STORAGE);
 
   // First, drop all the indexes we're no longer going to use.
   nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "DROP INDEX key_index;"
   ));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
@@ -746,17 +750,18 @@ UpgradeSchemaFrom5To6(mozIStorageConnect
 }
 
 nsresult
 UpgradeSchemaFrom6To7(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom6To7");
+  PROFILER_LABEL("OpenDatabaseHelper", "UpgradeSchemaFrom6To7",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "CREATE TEMPORARY TABLE temp_upgrade ("
       "id, "
       "name, "
       "key_path, "
       "auto_increment"
     ");"
@@ -805,17 +810,18 @@ UpgradeSchemaFrom6To7(mozIStorageConnect
 }
 
 nsresult
 UpgradeSchemaFrom7To8(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom7To8");
+  PROFILER_LABEL("OpenDatabaseHelper", "UpgradeSchemaFrom7To8",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "CREATE TEMPORARY TABLE temp_upgrade ("
       "id, "
       "object_store_id, "
       "name, "
       "key_path, "
       "unique_index, "
@@ -877,17 +883,18 @@ class CompressDataBlobsFunction MOZ_FINA
 {
 public:
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD
   OnFunctionCall(mozIStorageValueArray* aArguments,
                  nsIVariant** aResult)
   {
-    PROFILER_LABEL("IndexedDB", "CompressDataBlobsFunction::OnFunctionCall");
+    PROFILER_LABEL("CompressDataBlobsFunction", "OnFunctionCall",
+      js::ProfileEntry::Category::STORAGE);
 
     uint32_t argc;
     nsresult rv = aArguments->GetNumEntries(&argc);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (argc != 1) {
       NS_WARNING("Don't call me with the wrong number of arguments!");
       return NS_ERROR_UNEXPECTED;
@@ -927,17 +934,18 @@ public:
 NS_IMPL_ISUPPORTS(CompressDataBlobsFunction, mozIStorageFunction)
 
 nsresult
 UpgradeSchemaFrom8To9_0(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom8To9_0");
+  PROFILER_LABEL("OpenDatabaseHelper", "UpgradeSchemaFrom8To9_0",
+    js::ProfileEntry::Category::STORAGE);
 
   // We no longer use the dataVersion column.
   nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "UPDATE database SET dataVersion = 0;"
   ));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<mozIStorageFunction> compressor = new CompressDataBlobsFunction();
@@ -968,17 +976,18 @@ UpgradeSchemaFrom8To9_0(mozIStorageConne
 }
 
 nsresult
 UpgradeSchemaFrom9_0To10_0(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom9_0To10_0");
+  PROFILER_LABEL("OpenDatabaseHelper", "UpgradeSchemaFrom9_0To10_0",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "ALTER TABLE object_data ADD COLUMN file_ids TEXT;"
   ));
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "ALTER TABLE ai_object_data ADD COLUMN file_ids TEXT;"
@@ -995,17 +1004,18 @@ UpgradeSchemaFrom9_0To10_0(mozIStorageCo
 }
 
 nsresult
 UpgradeSchemaFrom10_0To11_0(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom10_0To11_0");
+  PROFILER_LABEL("OpenDatabaseHelper", "UpgradeSchemaFrom10_0To11_0",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
     "CREATE TEMPORARY TABLE temp_upgrade ("
       "id, "
       "object_store_id, "
       "name, "
       "key_path, "
       "unique_index, "
@@ -1134,17 +1144,18 @@ class EncodeKeysFunction MOZ_FINAL : pub
 {
 public:
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD
   OnFunctionCall(mozIStorageValueArray* aArguments,
                  nsIVariant** aResult)
   {
-    PROFILER_LABEL("IndexedDB", "EncodeKeysFunction::OnFunctionCall");
+    PROFILER_LABEL("EncodeKeysFunction", "OnFunctionCall",
+      js::ProfileEntry::Category::STORAGE);
 
     uint32_t argc;
     nsresult rv = aArguments->GetNumEntries(&argc);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (argc != 1) {
       NS_WARNING("Don't call me with the wrong number of arguments!");
       return NS_ERROR_UNEXPECTED;
@@ -1185,17 +1196,18 @@ public:
 NS_IMPL_ISUPPORTS(EncodeKeysFunction, mozIStorageFunction)
 
 nsresult
 UpgradeSchemaFrom11_0To12_0(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom11_0To12_0");
+  PROFILER_LABEL("OpenDatabaseHelper", "UpgradeSchemaFrom11_0To12_0",
+    js::ProfileEntry::Category::STORAGE);
 
   NS_NAMED_LITERAL_CSTRING(encoderName, "encode");
 
   nsCOMPtr<mozIStorageFunction> encoder = new EncodeKeysFunction();
 
   nsresult rv = aConnection->CreateFunction(encoderName, 1, encoder);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1402,17 +1414,18 @@ UpgradeSchemaFrom11_0To12_0(mozIStorageC
 
 nsresult
 UpgradeSchemaFrom12_0To13_0(mozIStorageConnection* aConnection,
                             bool* aVacuumNeeded)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom12_0To13_0");
+  PROFILER_LABEL("OpenDatabaseHelper", "UpgradeSchemaFrom12_0To13_0",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv;
 
 #if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK)
   int32_t defaultPageSize;
   rv = aConnection->GetDefaultPageSize(&defaultPageSize);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1622,17 +1635,18 @@ public:
 
     mWaitingDatabases.SwapElements(aWaitingDatabases);
   }
 
   NS_IMETHOD Run()
   {
     NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-    PROFILER_MAIN_THREAD_LABEL("IndexedDB", "VersionChangeEventsRunnable::Run");
+    PROFILER_MAIN_THREAD_LABEL("OpenDatabaseHelper", "VersionChangeEventsRunnable::Run",
+      js::ProfileEntry::Category::STORAGE);
 
     // Fire version change events at all of the databases that are not already
     // closed. Also kick bfcached documents out of bfcache.
     uint32_t count = mWaitingDatabases.Length();
     for (uint32_t index = 0; index < count; index++) {
       IDBDatabase* database =
         IDBDatabase::FromStorage(mWaitingDatabases[index]);
       NS_ASSERTION(database, "This shouldn't be null!");
@@ -1773,17 +1787,18 @@ OpenDatabaseHelper::RunImmediately()
 }
 
 nsresult
 OpenDatabaseHelper::DoDatabaseWork()
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "OpenDatabaseHelper::DoDatabaseWork");
+  PROFILER_LABEL("OpenDatabaseHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   mState = eFiringEvents; // In case we fail somewhere along the line.
 
   if (QuotaManager::IsShuttingDown()) {
     IDB_REPORT_INTERNAL_ERR();
     return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
   }
 
@@ -1926,17 +1941,18 @@ OpenDatabaseHelper::CreateDatabaseConnec
                                         PersistenceType aPersistenceType,
                                         const nsACString& aGroup,
                                         const nsACString& aOrigin,
                                         mozIStorageConnection** aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "OpenDatabaseHelper::CreateDatabaseConnection");
+  PROFILER_LABEL("OpenDatabaseHelper", "CreateDatabaseConnection",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv;
   bool exists;
 
   if (IndexedDatabaseManager::InLowDiskSpaceMode()) {
     rv = aDBFile->Exists(&exists);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -2190,17 +2206,18 @@ OpenDatabaseHelper::StartDelete()
 }
 
 NS_IMETHODIMP
 OpenDatabaseHelper::Run()
 {
   NS_ASSERTION(mState != eCreated, "Dispatch was not called?!?");
 
   if (NS_IsMainThread()) {
-    PROFILER_MAIN_THREAD_LABEL("IndexedDB", "OpenDatabaseHelper::Run");
+    PROFILER_MAIN_THREAD_LABEL("OpenDatabaseHelper", "Run",
+      js::ProfileEntry::Category::STORAGE);
 
     if (mState == eOpenPending) {
       if (NS_FAILED(mResultCode)) {
         return RunImmediately();
       }
 
       return DispatchToIOThread();
     }
@@ -2287,17 +2304,18 @@ OpenDatabaseHelper::Run()
                               Nullable<PersistenceType>(mPersistenceType),
                               mDatabaseId);
 
     ReleaseMainThreadObjects();
 
     return NS_OK;
   }
 
-  PROFILER_LABEL("IndexedDB", "OpenDatabaseHelper::Run");
+  PROFILER_LABEL("OpenDatabaseHelper", "Run",
+    js::ProfileEntry::Category::STORAGE);
 
   // We're on the DB thread.
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
   IDB_PROFILER_MARK("IndexedDB Request %llu: Beginning database work",
                     "IDBRequest[%llu] DT Start", mRequest->GetSerialNumber());
 
   NS_ASSERTION(mState == eDBWork, "Why are we here?");
@@ -2311,18 +2329,18 @@ OpenDatabaseHelper::Run()
   return NS_DispatchToMainThread(this);
 }
 
 nsresult
 OpenDatabaseHelper::EnsureSuccessResult()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "OpenDatabaseHelper::EnsureSuccessResult");
+  PROFILER_MAIN_THREAD_LABEL("OpenDatabaseHelper", "EnsureSuccessResult",
+    js::ProfileEntry::Category::STORAGE);
 
   nsRefPtr<DatabaseInfo> dbInfo;
   if (DatabaseInfo::Get(mDatabaseId, getter_AddRefs(dbInfo))) {
 
 #ifdef DEBUG
     {
       NS_ASSERTION(dbInfo->name == mName &&
                    dbInfo->version == mCurrentVersion &&
@@ -2456,18 +2474,18 @@ OpenDatabaseHelper::BlockDatabase()
   mDatabase->EnterSetVersionTransaction();
 }
 
 void
 OpenDatabaseHelper::DispatchSuccessEvent()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                              "OpenDatabaseHelper::DispatchSuccessEvent");
+  PROFILER_MAIN_THREAD_LABEL("OpenDatabaseHelper", "DispatchSuccessEvent",
+    js::ProfileEntry::Category::STORAGE);
 
   nsRefPtr<nsIDOMEvent> event =
     CreateGenericEvent(mOpenDBRequest, NS_LITERAL_STRING(SUCCESS_EVT_STR),
                        eDoesNotBubble, eNotCancelable);
   if (!event) {
     NS_ERROR("Failed to create event!");
     return;
   }
@@ -2476,18 +2494,18 @@ OpenDatabaseHelper::DispatchSuccessEvent
   mOpenDBRequest->DispatchEvent(event, &dummy);
 }
 
 void
 OpenDatabaseHelper::DispatchErrorEvent()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                              "OpenDatabaseHelper::DispatchErrorEvent");
+  PROFILER_MAIN_THREAD_LABEL("OpenDatabaseHelper", "DispatchErrorEvent",
+    js::ProfileEntry::Category::STORAGE);
 
   nsRefPtr<nsIDOMEvent> event =
     CreateGenericEvent(mOpenDBRequest, NS_LITERAL_STRING(ERROR_EVT_STR),
                        eDoesBubble, eCancelable);
   if (!event) {
     NS_ERROR("Failed to create event!");
     return;
   }
@@ -2528,17 +2546,18 @@ SetVersionHelper::Init()
 
 nsresult
 SetVersionHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(aConnection, "Passing a null connection!");
 
-  PROFILER_LABEL("IndexedDB", "SetVersionHelper::DoDatabaseWork");
+  PROFILER_LABEL("SetVersionHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   nsCOMPtr<mozIStorageStatement> stmt;
   nsresult rv = aConnection->CreateStatement(NS_LITERAL_CSTRING(
     "UPDATE database "
     "SET version = :version"
   ), getter_AddRefs(stmt));
   IDB_ENSURE_SUCCESS(rv, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
 
@@ -2649,17 +2668,18 @@ NS_IMPL_ISUPPORTS_INHERITED0(DeleteDatab
 
 nsresult
 DeleteDatabaseHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
 {
   AssertIsOnIOThread();
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
   NS_ASSERTION(!aConnection, "How did we get a connection here?");
 
-  PROFILER_LABEL("IndexedDB", "DeleteDatabaseHelper::DoDatabaseWork");
+  PROFILER_LABEL("DeleteDatabaseHelper", "DoDatabaseWork",
+    js::ProfileEntry::Category::STORAGE);
 
   const StoragePrivilege& privilege = mOpenHelper->Privilege();
 
   QuotaManager* quotaManager = QuotaManager::Get();
   NS_ASSERTION(quotaManager, "This should never fail!");
 
   nsCOMPtr<nsIFile> directory;
   nsresult rv = quotaManager->GetDirectoryForOrigin(mPersistenceType,

--- a/dom/indexedDB/TransactionThreadPool.cpp
+++ b/dom/indexedDB/TransactionThreadPool.cpp
@@ -149,17 +149,18 @@ TransactionThreadPool::Init()
   return NS_OK;
 }
 
 nsresult
 TransactionThreadPool::Cleanup()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB", "TransactionThreadPool::Cleanup");
+  PROFILER_MAIN_THREAD_LABEL("TransactionThreadPool", "Cleanup",
+    js::ProfileEntry::Category::STORAGE);
 
   nsresult rv = mThreadPool->Shutdown();
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Make sure the pool is still accessible while any callbacks generated from
   // the other threads are processed.
   rv = NS_ProcessPendingEvents(nullptr);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -201,18 +202,18 @@ TransactionThreadPool::MaybeUnblockTrans
 }
 
 void
 TransactionThreadPool::FinishTransaction(IDBTransaction* aTransaction)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(aTransaction, "Null pointer!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "TransactionThreadPool::FinishTransaction");
+  PROFILER_MAIN_THREAD_LABEL("TransactionThreadPool", "FinishTransaction",
+    js::ProfileEntry::Category::STORAGE);
 
   // AddRef here because removing from the hash will call Release.
   nsRefPtr<IDBTransaction> transaction(aTransaction);
 
   const nsACString& databaseId = aTransaction->mDatabase->Id();
 
   DatabaseTransactionInfo* dbTransactionInfo;
   if (!mTransactionsInProgress.Get(databaseId, &dbTransactionInfo)) {
@@ -412,19 +413,18 @@ TransactionThreadPool::CollectTransactio
 }
 
 void
 TransactionThreadPool::AbortTransactionsForDatabase(IDBDatabase* aDatabase)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(aDatabase, "Null pointer!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "TransactionThreadPool::"
-                             "AbortTransactionsForDatabase");
+  PROFILER_MAIN_THREAD_LABEL("TransactionThreadPool", "AbortTransactionsForDatabase",
+    js::ProfileEntry::Category::STORAGE);
 
   // Get list of transactions for this database id
   DatabaseTransactionInfo* dbTransactionInfo;
   if (!mTransactionsInProgress.Get(aDatabase->Id(), &dbTransactionInfo)) {
     // If there are no transactions, we're done.
     return;
   }
 
@@ -496,18 +496,18 @@ TransactionThreadPool::HasTransactionsFo
   return info.found;
 }
 
 bool
 TransactionThreadPool::MaybeFireCallback(DatabasesCompleteCallback aCallback)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB",
-                             "TransactionThreadPool::MaybeFireCallback");
+  PROFILER_MAIN_THREAD_LABEL("TransactionThreadPool", "MaybeFireCallback",
+    js::ProfileEntry::Category::STORAGE);
 
   for (uint32_t index = 0; index < aCallback.mDatabases.Length(); index++) {
     IDBDatabase* database = aCallback.mDatabases[index];
     if (!database) {
       MOZ_CRASH();
     }
 
     if (mTransactionsInProgress.Get(database->Id(), nullptr)) {
@@ -568,17 +568,18 @@ TransactionThreadPool::TransactionQueue:
 NS_IMPL_ISUPPORTS(TransactionThreadPool::TransactionQueue, nsIRunnable)
 
 NS_IMETHODIMP
 TransactionThreadPool::TransactionQueue::Run()
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
-  PROFILER_LABEL("IndexedDB", "TransactionQueue::Run");
+  PROFILER_LABEL("TransactionQueue", "Run",
+    js::ProfileEntry::Category::STORAGE);
 
   IDB_PROFILER_MARK("IndexedDB Transaction %llu: Beginning database work",
                     "IDBTransaction[%llu] DT Start",
                     mTransaction->GetSerialNumber());
 
   nsAutoTArray<nsCOMPtr<nsIRunnable>, 10> queue;
   nsCOMPtr<nsIRunnable> finishRunnable;
   bool shouldFinish = false;
@@ -638,17 +639,18 @@ FinishTransactionRunnable::FinishTransac
 
 NS_IMPL_ISUPPORTS(FinishTransactionRunnable, nsIRunnable)
 
 NS_IMETHODIMP
 FinishTransactionRunnable::Run()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  PROFILER_MAIN_THREAD_LABEL("IndexedDB", "FinishTransactionRunnable::Run");
+  PROFILER_MAIN_THREAD_LABEL("FinishTransactionRunnable", "Run",
+    js::ProfileEntry::Category::STORAGE);
 
   if (!gThreadPool) {
     NS_ERROR("Running after shutdown!");
     return NS_ERROR_FAILURE;
   }
 
   gThreadPool->FinishTransaction(mTransaction);