--- a/accessible/ipc/ProxyAccessible.cpp
+++ b/accessible/ipc/ProxyAccessible.cpp
@@ -75,63 +75,63 @@ ProxyAccessible::MustPruneChildren() con
   return mChildren[0]->Role() == roles::TEXT_LEAF
     || mChildren[0]->Role() == roles::STATICTEXT;
 }
 
 uint64_t
 ProxyAccessible::State() const
 {
   uint64_t state = 0;
-  unused << mDoc->SendState(mID, &state);
+  Unused << mDoc->SendState(mID, &state);
   return state;
 }
 
 uint64_t
 ProxyAccessible::NativeState() const
 {
   uint64_t state = 0;
-  unused << mDoc->SendNativeState(mID, &state);
+  Unused << mDoc->SendNativeState(mID, &state);
   return state;
 }
 
 void
 ProxyAccessible::Name(nsString& aName) const
 {
-  unused << mDoc->SendName(mID, &aName);
+  Unused << mDoc->SendName(mID, &aName);
 }
 
 void
 ProxyAccessible::Value(nsString& aValue) const
 {
-  unused << mDoc->SendValue(mID, &aValue);
+  Unused << mDoc->SendValue(mID, &aValue);
 }
 
 void
 ProxyAccessible::Help(nsString& aHelp) const
 {
-  unused << mDoc->SendHelp(mID, &aHelp);
+  Unused << mDoc->SendHelp(mID, &aHelp);
 }
 
 void
 ProxyAccessible::Description(nsString& aDesc) const
 {
-  unused << mDoc->SendDescription(mID, &aDesc);
+  Unused << mDoc->SendDescription(mID, &aDesc);
 }
 
 void
 ProxyAccessible::Attributes(nsTArray<Attribute> *aAttrs) const
 {
-  unused << mDoc->SendAttributes(mID, aAttrs);
+  Unused << mDoc->SendAttributes(mID, aAttrs);
 }
 
 nsTArray<ProxyAccessible*>
 ProxyAccessible::RelationByType(RelationType aType) const
 {
   nsTArray<uint64_t> targetIDs;
-  unused << mDoc->SendRelationByType(mID, static_cast<uint32_t>(aType),
+  Unused << mDoc->SendRelationByType(mID, static_cast<uint32_t>(aType),
                                      &targetIDs);
 
   size_t targetCount = targetIDs.Length();
   nsTArray<ProxyAccessible*> targets(targetCount);
   for (size_t i = 0; i < targetCount; i++)
     if (ProxyAccessible* proxy = mDoc->GetAccessible(targetIDs[i]))
       targets.AppendElement(proxy);
 
@@ -139,17 +139,17 @@ ProxyAccessible::RelationByType(Relation
 }
 
 void
 ProxyAccessible::Relations(nsTArray<RelationType>* aTypes,
                            nsTArray<nsTArray<ProxyAccessible*>>* aTargetSets)
   const
 {
   nsTArray<RelationTargets> ipcRelations;
-  unused << mDoc->SendRelations(mID, &ipcRelations);
+  Unused << mDoc->SendRelations(mID, &ipcRelations);
 
   size_t relationCount = ipcRelations.Length();
   aTypes->SetCapacity(relationCount);
   aTargetSets->SetCapacity(relationCount);
   for (size_t i = 0; i < relationCount; i++) {
     uint32_t type = ipcRelations[i].Type();
     if (type > static_cast<uint32_t>(RelationType::LAST))
       continue;
@@ -167,977 +167,977 @@ ProxyAccessible::Relations(nsTArray<Rela
     aTypes->AppendElement(static_cast<RelationType>(type));
   }
 }
 
 bool
 ProxyAccessible::IsSearchbox() const
 {
   bool retVal = false;
-  unused << mDoc->SendIsSearchbox(mID, &retVal);
+  Unused << mDoc->SendIsSearchbox(mID, &retVal);
   return retVal;
 }
 
 nsIAtom*
 ProxyAccessible::LandmarkRole() const
 {
   nsString landmark;
-  unused << mDoc->SendLandmarkRole(mID, &landmark);
+  Unused << mDoc->SendLandmarkRole(mID, &landmark);
   return NS_GetStaticAtom(landmark);
 }
 
 nsIAtom*
 ProxyAccessible::ARIARoleAtom() const
 {
   nsString role;
-  unused << mDoc->SendARIARoleAtom(mID, &role);
+  Unused << mDoc->SendARIARoleAtom(mID, &role);
   return NS_GetStaticAtom(role);
 }
 
 int32_t
 ProxyAccessible::GetLevelInternal()
 {
   int32_t level = 0;
-  unused << mDoc->SendGetLevelInternal(mID, &level);
+  Unused << mDoc->SendGetLevelInternal(mID, &level);
   return level;
 }
 
 int32_t
 ProxyAccessible::CaretLineNumber()
 {
   int32_t line = -1;
-  unused << mDoc->SendCaretOffset(mID, &line);
+  Unused << mDoc->SendCaretOffset(mID, &line);
   return line;
 }
 
 int32_t
 ProxyAccessible::CaretOffset()
 {
   int32_t offset = 0;
-  unused << mDoc->SendCaretOffset(mID, &offset);
+  Unused << mDoc->SendCaretOffset(mID, &offset);
   return offset;
 }
 
 void
 ProxyAccessible::SetCaretOffset(int32_t aOffset)
 {
-  unused << mDoc->SendSetCaretOffset(mID, aOffset);
+  Unused << mDoc->SendSetCaretOffset(mID, aOffset);
 }
 
 int32_t
 ProxyAccessible::CharacterCount()
 {
   int32_t count = 0;
-  unused << mDoc->SendCharacterCount(mID, &count);
+  Unused << mDoc->SendCharacterCount(mID, &count);
   return count;
 }
 
 int32_t
 ProxyAccessible::SelectionCount()
 {
   int32_t count = 0;
-  unused << mDoc->SendSelectionCount(mID, &count);
+  Unused << mDoc->SendSelectionCount(mID, &count);
   return count;
 }
 
 bool
 ProxyAccessible::TextSubstring(int32_t aStartOffset, int32_t aEndOfset,
                                nsString& aText) const
 {
   bool valid;
-  unused << mDoc->SendTextSubstring(mID, aStartOffset, aEndOfset, &aText, &valid);
+  Unused << mDoc->SendTextSubstring(mID, aStartOffset, aEndOfset, &aText, &valid);
   return valid;
 }
 
 void
 ProxyAccessible::GetTextAfterOffset(int32_t aOffset,
                                     AccessibleTextBoundary aBoundaryType,
                                     nsString& aText, int32_t* aStartOffset,
                                     int32_t* aEndOffset)
 {
-  unused << mDoc->SendGetTextAfterOffset(mID, aOffset, aBoundaryType,
+  Unused << mDoc->SendGetTextAfterOffset(mID, aOffset, aBoundaryType,
                                          &aText, aStartOffset, aEndOffset);
 }
 
 void
 ProxyAccessible::GetTextAtOffset(int32_t aOffset,
                                  AccessibleTextBoundary aBoundaryType,
                                  nsString& aText, int32_t* aStartOffset,
                                  int32_t* aEndOffset)
 {
-  unused << mDoc->SendGetTextAtOffset(mID, aOffset, aBoundaryType,
+  Unused << mDoc->SendGetTextAtOffset(mID, aOffset, aBoundaryType,
                                       &aText, aStartOffset, aEndOffset);
 }
 
 void
 ProxyAccessible::GetTextBeforeOffset(int32_t aOffset,
                                      AccessibleTextBoundary aBoundaryType,
                                      nsString& aText, int32_t* aStartOffset,
                                      int32_t* aEndOffset)
 {
-  unused << mDoc->SendGetTextBeforeOffset(mID, aOffset, aBoundaryType,
+  Unused << mDoc->SendGetTextBeforeOffset(mID, aOffset, aBoundaryType,
                                           &aText, aStartOffset, aEndOffset);
 }
 
 char16_t
 ProxyAccessible::CharAt(int32_t aOffset)
 {
   uint16_t retval = 0;
-  unused << mDoc->SendCharAt(mID, aOffset, &retval);
+  Unused << mDoc->SendCharAt(mID, aOffset, &retval);
   return static_cast<char16_t>(retval);
 }
 
 void
 ProxyAccessible::TextAttributes(bool aIncludeDefAttrs,
                                 int32_t aOffset,
                                 nsTArray<Attribute>* aAttributes,
                                 int32_t* aStartOffset,
                                 int32_t* aEndOffset)
 {
-  unused << mDoc->SendTextAttributes(mID, aIncludeDefAttrs, aOffset,
+  Unused << mDoc->SendTextAttributes(mID, aIncludeDefAttrs, aOffset,
                                      aAttributes, aStartOffset, aEndOffset);
 }
 
 void
 ProxyAccessible::DefaultTextAttributes(nsTArray<Attribute>* aAttrs)
 {
-  unused << mDoc->SendDefaultTextAttributes(mID, aAttrs);
+  Unused << mDoc->SendDefaultTextAttributes(mID, aAttrs);
 }
 
 nsIntRect
 ProxyAccessible::TextBounds(int32_t aStartOffset, int32_t aEndOffset,
                             uint32_t aCoordType)
 {
   nsIntRect rect;
-  unused <<
+  Unused <<
     mDoc->SendTextBounds(mID, aStartOffset, aEndOffset, aCoordType, &rect);
   return rect;
 }
 
 nsIntRect
 ProxyAccessible::CharBounds(int32_t aOffset, uint32_t aCoordType)
 {
   nsIntRect rect;
-  unused <<
+  Unused <<
     mDoc->SendCharBounds(mID, aOffset, aCoordType, &rect);
   return rect;
 }
 
 int32_t
 ProxyAccessible::OffsetAtPoint(int32_t aX, int32_t aY, uint32_t aCoordType)
 {
   int32_t retVal = -1;
-  unused << mDoc->SendOffsetAtPoint(mID, aX, aY, aCoordType, &retVal);
+  Unused << mDoc->SendOffsetAtPoint(mID, aX, aY, aCoordType, &retVal);
   return retVal;
 }
 
 bool
 ProxyAccessible::SelectionBoundsAt(int32_t aSelectionNum,
                                    nsString& aData,
                                    int32_t* aStartOffset,
                                    int32_t* aEndOffset)
 {
   bool retVal = false;
-  unused << mDoc->SendSelectionBoundsAt(mID, aSelectionNum, &retVal, &aData,
+  Unused << mDoc->SendSelectionBoundsAt(mID, aSelectionNum, &retVal, &aData,
                                         aStartOffset, aEndOffset);
   return retVal;
 }
 
 bool
 ProxyAccessible::SetSelectionBoundsAt(int32_t aSelectionNum,
                                       int32_t aStartOffset,
                                       int32_t aEndOffset)
 {
   bool retVal = false;
-  unused << mDoc->SendSetSelectionBoundsAt(mID, aSelectionNum, aStartOffset,
+  Unused << mDoc->SendSetSelectionBoundsAt(mID, aSelectionNum, aStartOffset,
                                            aEndOffset, &retVal);
   return retVal;
 }
 
 bool
 ProxyAccessible::AddToSelection(int32_t aStartOffset,
                                 int32_t aEndOffset)
 {
   bool retVal = false;
-  unused << mDoc->SendAddToSelection(mID, aStartOffset, aEndOffset, &retVal);
+  Unused << mDoc->SendAddToSelection(mID, aStartOffset, aEndOffset, &retVal);
   return retVal;
 }
 
 bool
 ProxyAccessible::RemoveFromSelection(int32_t aSelectionNum)
 {
   bool retVal = false;
-  unused << mDoc->SendRemoveFromSelection(mID, aSelectionNum, &retVal);
+  Unused << mDoc->SendRemoveFromSelection(mID, aSelectionNum, &retVal);
   return retVal;
 }
 
 void
 ProxyAccessible::ScrollSubstringTo(int32_t aStartOffset, int32_t aEndOffset,
                                    uint32_t aScrollType)
 {
-  unused << mDoc->SendScrollSubstringTo(mID, aStartOffset, aEndOffset, aScrollType);
+  Unused << mDoc->SendScrollSubstringTo(mID, aStartOffset, aEndOffset, aScrollType);
 }
 
 void
 ProxyAccessible::ScrollSubstringToPoint(int32_t aStartOffset,
                                         int32_t aEndOffset,
                                         uint32_t aCoordinateType,
                                         int32_t aX, int32_t aY)
 {
-  unused << mDoc->SendScrollSubstringToPoint(mID, aStartOffset, aEndOffset,
+  Unused << mDoc->SendScrollSubstringToPoint(mID, aStartOffset, aEndOffset,
                                              aCoordinateType, aX, aY);
 }
 
 void
 ProxyAccessible::Text(nsString* aText)
 {
-  unused << mDoc->SendText(mID, aText);
+  Unused << mDoc->SendText(mID, aText);
 }
 
 void
 ProxyAccessible::ReplaceText(const nsString& aText)
 {
-  unused << mDoc->SendReplaceText(mID, aText);
+  Unused << mDoc->SendReplaceText(mID, aText);
 }
 
 bool
 ProxyAccessible::InsertText(const nsString& aText, int32_t aPosition)
 {
   bool valid;
-  unused << mDoc->SendInsertText(mID, aText, aPosition, &valid);
+  Unused << mDoc->SendInsertText(mID, aText, aPosition, &valid);
   return valid;
 }
 
 bool
 ProxyAccessible::CopyText(int32_t aStartPos, int32_t aEndPos)
 {
   bool valid;
-  unused << mDoc->SendCopyText(mID, aStartPos, aEndPos, &valid);
+  Unused << mDoc->SendCopyText(mID, aStartPos, aEndPos, &valid);
   return valid;
 }
 
 bool
 ProxyAccessible::CutText(int32_t aStartPos, int32_t aEndPos)
 {
   bool valid;
-  unused << mDoc->SendCutText(mID, aStartPos, aEndPos, &valid);
+  Unused << mDoc->SendCutText(mID, aStartPos, aEndPos, &valid);
   return valid;
 }
 
 bool
 ProxyAccessible::DeleteText(int32_t aStartPos, int32_t aEndPos)
 {
   bool valid;
-  unused << mDoc->SendDeleteText(mID, aStartPos, aEndPos, &valid);
+  Unused << mDoc->SendDeleteText(mID, aStartPos, aEndPos, &valid);
   return valid;
 }
 
 bool
 ProxyAccessible::PasteText(int32_t aPosition)
 {
   bool valid;
-  unused << mDoc->SendPasteText(mID, aPosition, &valid);
+  Unused << mDoc->SendPasteText(mID, aPosition, &valid);
   return valid;
 }
 
 nsIntPoint
 ProxyAccessible::ImagePosition(uint32_t aCoordType)
 {
   nsIntPoint retVal;
-  unused << mDoc->SendImagePosition(mID, aCoordType, &retVal);
+  Unused << mDoc->SendImagePosition(mID, aCoordType, &retVal);
   return retVal;
 }
 
 nsIntSize
 ProxyAccessible::ImageSize()
 {
   nsIntSize retVal;
-  unused << mDoc->SendImageSize(mID, &retVal);
+  Unused << mDoc->SendImageSize(mID, &retVal);
   return retVal;
 }
 
 uint32_t
 ProxyAccessible::StartOffset(bool* aOk)
 {
   uint32_t retVal = 0;
-  unused << mDoc->SendStartOffset(mID, &retVal, aOk);
+  Unused << mDoc->SendStartOffset(mID, &retVal, aOk);
   return retVal;
 }
 
 uint32_t
 ProxyAccessible::EndOffset(bool* aOk)
 {
   uint32_t retVal = 0;
-  unused << mDoc->SendEndOffset(mID, &retVal, aOk);
+  Unused << mDoc->SendEndOffset(mID, &retVal, aOk);
   return retVal;
 }
 
 bool
 ProxyAccessible::IsLinkValid()
 {
   bool retVal = false;
-  unused << mDoc->SendIsLinkValid(mID, &retVal);
+  Unused << mDoc->SendIsLinkValid(mID, &retVal);
   return retVal;
 }
 
 uint32_t
 ProxyAccessible::AnchorCount(bool* aOk)
 {
   uint32_t retVal = 0;
-  unused << mDoc->SendAnchorCount(mID, &retVal, aOk);
+  Unused << mDoc->SendAnchorCount(mID, &retVal, aOk);
   return retVal;
 }
 
 void
 ProxyAccessible::AnchorURIAt(uint32_t aIndex, nsCString& aURI, bool* aOk)
 {
-  unused << mDoc->SendAnchorURIAt(mID, aIndex, &aURI, aOk);
+  Unused << mDoc->SendAnchorURIAt(mID, aIndex, &aURI, aOk);
 }
 
 ProxyAccessible*
 ProxyAccessible::AnchorAt(uint32_t aIndex)
 {
   uint64_t id = 0;
   bool ok = false;
-  unused << mDoc->SendAnchorAt(mID, aIndex, &id, &ok);
+  Unused << mDoc->SendAnchorAt(mID, aIndex, &id, &ok);
   return ok ? mDoc->GetAccessible(id) : nullptr;
 }
 
 uint32_t
 ProxyAccessible::LinkCount()
 {
   uint32_t retVal = 0;
-  unused << mDoc->SendLinkCount(mID, &retVal);
+  Unused << mDoc->SendLinkCount(mID, &retVal);
   return retVal;
 }
 
 ProxyAccessible*
 ProxyAccessible::LinkAt(const uint32_t& aIndex)
 {
   uint64_t linkID = 0;
   bool ok = false;
-  unused << mDoc->SendLinkAt(mID, aIndex, &linkID, &ok);
+  Unused << mDoc->SendLinkAt(mID, aIndex, &linkID, &ok);
   return ok ? mDoc->GetAccessible(linkID) : nullptr;
 }
 
 int32_t
 ProxyAccessible::LinkIndexOf(ProxyAccessible* aLink)
 {
   int32_t retVal = -1;
   if (aLink) {
-    unused << mDoc->SendLinkIndexOf(mID, aLink->ID(), &retVal);
+    Unused << mDoc->SendLinkIndexOf(mID, aLink->ID(), &retVal);
   }
 
   return retVal;
 }
 
 int32_t
 ProxyAccessible::LinkIndexAtOffset(uint32_t aOffset)
 {
   int32_t retVal = -1;
-  unused << mDoc->SendLinkIndexAtOffset(mID, aOffset, &retVal);
+  Unused << mDoc->SendLinkIndexAtOffset(mID, aOffset, &retVal);
   return retVal;
 }
 
 ProxyAccessible*
 ProxyAccessible::TableOfACell()
 {
   uint64_t tableID = 0;
   bool ok = false;
-  unused << mDoc->SendTableOfACell(mID, &tableID, &ok);
+  Unused << mDoc->SendTableOfACell(mID, &tableID, &ok);
   return ok ? mDoc->GetAccessible(tableID) : nullptr;
 }
 
 uint32_t
 ProxyAccessible::ColIdx()
 {
   uint32_t index = 0;
-  unused << mDoc->SendColIdx(mID, &index);
+  Unused << mDoc->SendColIdx(mID, &index);
   return index;
 }
 
 uint32_t
 ProxyAccessible::RowIdx()
 {
   uint32_t index = 0;
-  unused << mDoc->SendRowIdx(mID, &index);
+  Unused << mDoc->SendRowIdx(mID, &index);
   return index;
 }
 
 uint32_t
 ProxyAccessible::ColExtent()
 {
   uint32_t extent = 0;
-  unused << mDoc->SendColExtent(mID, &extent);
+  Unused << mDoc->SendColExtent(mID, &extent);
   return extent;
 }
 
 uint32_t
 ProxyAccessible::RowExtent()
 {
   uint32_t extent = 0;
-  unused << mDoc->SendRowExtent(mID, &extent);
+  Unused << mDoc->SendRowExtent(mID, &extent);
   return extent;
 }
 
 void
 ProxyAccessible::ColHeaderCells(nsTArray<ProxyAccessible*>* aCells)
 {
   nsTArray<uint64_t> targetIDs;
-  unused << mDoc->SendColHeaderCells(mID, &targetIDs);
+  Unused << mDoc->SendColHeaderCells(mID, &targetIDs);
 
   size_t targetCount = targetIDs.Length();
   for (size_t i = 0; i < targetCount; i++) {
     aCells->AppendElement(mDoc->GetAccessible(targetIDs[i]));
   }
 }
 
 void
 ProxyAccessible::RowHeaderCells(nsTArray<ProxyAccessible*>* aCells)
 {
   nsTArray<uint64_t> targetIDs;
-  unused << mDoc->SendRowHeaderCells(mID, &targetIDs);
+  Unused << mDoc->SendRowHeaderCells(mID, &targetIDs);
 
   size_t targetCount = targetIDs.Length();
   for (size_t i = 0; i < targetCount; i++) {
     aCells->AppendElement(mDoc->GetAccessible(targetIDs[i]));
   }
 }
 
 bool
 ProxyAccessible::IsCellSelected()
 {
   bool selected = false;
-  unused << mDoc->SendIsCellSelected(mID, &selected);
+  Unused << mDoc->SendIsCellSelected(mID, &selected);
   return selected;
 }
 
 ProxyAccessible*
 ProxyAccessible::TableCaption()
 {
   uint64_t captionID = 0;
   bool ok = false;
-  unused << mDoc->SendTableCaption(mID, &captionID, &ok);
+  Unused << mDoc->SendTableCaption(mID, &captionID, &ok);
   return ok ? mDoc->GetAccessible(captionID) : nullptr;
 }
 
 void
 ProxyAccessible::TableSummary(nsString& aSummary)
 {
-  unused << mDoc->SendTableSummary(mID, &aSummary);
+  Unused << mDoc->SendTableSummary(mID, &aSummary);
 }
 
 uint32_t
 ProxyAccessible::TableColumnCount()
 {
   uint32_t count = 0;
-  unused << mDoc->SendTableColumnCount(mID, &count);
+  Unused << mDoc->SendTableColumnCount(mID, &count);
   return count;
 }
 
 uint32_t
 ProxyAccessible::TableRowCount()
 {
   uint32_t count = 0;
-  unused << mDoc->SendTableRowCount(mID, &count);
+  Unused << mDoc->SendTableRowCount(mID, &count);
   return count;
 }
 
 ProxyAccessible*
 ProxyAccessible::TableCellAt(uint32_t aRow, uint32_t aCol)
 {
   uint64_t cellID = 0;
   bool ok = false;
-  unused << mDoc->SendTableCellAt(mID, aRow, aCol, &cellID, &ok);
+  Unused << mDoc->SendTableCellAt(mID, aRow, aCol, &cellID, &ok);
   return ok ? mDoc->GetAccessible(cellID) : nullptr;
 }
 
 int32_t
 ProxyAccessible::TableCellIndexAt(uint32_t aRow, uint32_t aCol)
 {
   int32_t index = 0;
-  unused << mDoc->SendTableCellIndexAt(mID, aRow, aCol, &index);
+  Unused << mDoc->SendTableCellIndexAt(mID, aRow, aCol, &index);
   return index;
 }
 
 int32_t
 ProxyAccessible::TableColumnIndexAt(uint32_t aCellIndex)
 {
   int32_t index = 0;
-  unused << mDoc->SendTableColumnIndexAt(mID, aCellIndex, &index);
+  Unused << mDoc->SendTableColumnIndexAt(mID, aCellIndex, &index);
   return index;
 }
 
 int32_t
 ProxyAccessible::TableRowIndexAt(uint32_t aCellIndex)
 {
   int32_t index = 0;
-  unused << mDoc->SendTableRowIndexAt(mID, aCellIndex, &index);
+  Unused << mDoc->SendTableRowIndexAt(mID, aCellIndex, &index);
   return index;
 }
 
 void
 ProxyAccessible::TableRowAndColumnIndicesAt(uint32_t aCellIndex,
                                             int32_t* aRow, int32_t* aCol)
 {
-  unused << mDoc->SendTableRowAndColumnIndicesAt(mID, aCellIndex, aRow, aCol);
+  Unused << mDoc->SendTableRowAndColumnIndicesAt(mID, aCellIndex, aRow, aCol);
 }
 
 uint32_t
 ProxyAccessible::TableColumnExtentAt(uint32_t aRow, uint32_t aCol)
 {
   uint32_t extent = 0;
-  unused << mDoc->SendTableColumnExtentAt(mID, aRow, aCol, &extent);
+  Unused << mDoc->SendTableColumnExtentAt(mID, aRow, aCol, &extent);
   return extent;
 }
 
 uint32_t
 ProxyAccessible::TableRowExtentAt(uint32_t aRow, uint32_t aCol)
 {
   uint32_t extent = 0;
-  unused << mDoc->SendTableRowExtentAt(mID, aRow, aCol, &extent);
+  Unused << mDoc->SendTableRowExtentAt(mID, aRow, aCol, &extent);
   return extent;
 }
 
 void
 ProxyAccessible::TableColumnDescription(uint32_t aCol, nsString& aDescription)
 {
-  unused << mDoc->SendTableColumnDescription(mID, aCol, &aDescription);
+  Unused << mDoc->SendTableColumnDescription(mID, aCol, &aDescription);
 }
 
 void
 ProxyAccessible::TableRowDescription(uint32_t aRow, nsString& aDescription)
 {
-  unused << mDoc->SendTableRowDescription(mID, aRow, &aDescription);
+  Unused << mDoc->SendTableRowDescription(mID, aRow, &aDescription);
 }
 
 bool
 ProxyAccessible::TableColumnSelected(uint32_t aCol)
 {
   bool selected = false;
-  unused << mDoc->SendTableColumnSelected(mID, aCol, &selected);
+  Unused << mDoc->SendTableColumnSelected(mID, aCol, &selected);
   return selected;
 }
 
 bool
 ProxyAccessible::TableRowSelected(uint32_t aRow)
 {
   bool selected = false;
-  unused << mDoc->SendTableRowSelected(mID, aRow, &selected);
+  Unused << mDoc->SendTableRowSelected(mID, aRow, &selected);
   return selected;
 }
 
 bool
 ProxyAccessible::TableCellSelected(uint32_t aRow, uint32_t aCol)
 {
   bool selected = false;
-  unused << mDoc->SendTableCellSelected(mID, aRow, aCol, &selected);
+  Unused << mDoc->SendTableCellSelected(mID, aRow, aCol, &selected);
   return selected;
 }
 
 uint32_t
 ProxyAccessible::TableSelectedCellCount()
 {
   uint32_t count = 0;
-  unused << mDoc->SendTableSelectedCellCount(mID, &count);
+  Unused << mDoc->SendTableSelectedCellCount(mID, &count);
   return count;
 }
 
 uint32_t
 ProxyAccessible::TableSelectedColumnCount()
 {
   uint32_t count = 0;
-  unused << mDoc->SendTableSelectedColumnCount(mID, &count);
+  Unused << mDoc->SendTableSelectedColumnCount(mID, &count);
   return count;
 }
 
 uint32_t
 ProxyAccessible::TableSelectedRowCount()
 {
   uint32_t count = 0;
-  unused << mDoc->SendTableSelectedRowCount(mID, &count);
+  Unused << mDoc->SendTableSelectedRowCount(mID, &count);
   return count;
 }
 
 void
 ProxyAccessible::TableSelectedCells(nsTArray<ProxyAccessible*>* aCellIDs)
 {
   nsAutoTArray<uint64_t, 30> cellIDs;
-  unused << mDoc->SendTableSelectedCells(mID, &cellIDs);
+  Unused << mDoc->SendTableSelectedCells(mID, &cellIDs);
   aCellIDs->SetCapacity(cellIDs.Length());
   for (uint32_t i = 0; i < cellIDs.Length(); ++i) {
     aCellIDs->AppendElement(mDoc->GetAccessible(cellIDs[i]));
   }
 }
 
 void
 ProxyAccessible::TableSelectedCellIndices(nsTArray<uint32_t>* aCellIndices)
 {
-  unused << mDoc->SendTableSelectedCellIndices(mID, aCellIndices);
+  Unused << mDoc->SendTableSelectedCellIndices(mID, aCellIndices);
 }
 
 void
 ProxyAccessible::TableSelectedColumnIndices(nsTArray<uint32_t>* aColumnIndices)
 {
-  unused << mDoc->SendTableSelectedColumnIndices(mID, aColumnIndices);
+  Unused << mDoc->SendTableSelectedColumnIndices(mID, aColumnIndices);
 }
 
 void
 ProxyAccessible::TableSelectedRowIndices(nsTArray<uint32_t>* aRowIndices)
 {
-  unused << mDoc->SendTableSelectedRowIndices(mID, aRowIndices);
+  Unused << mDoc->SendTableSelectedRowIndices(mID, aRowIndices);
 }
 
 void
 ProxyAccessible::TableSelectColumn(uint32_t aCol)
 {
-  unused << mDoc->SendTableSelectColumn(mID, aCol);
+  Unused << mDoc->SendTableSelectColumn(mID, aCol);
 }
 
 void
 ProxyAccessible::TableSelectRow(uint32_t aRow)
 {
-  unused << mDoc->SendTableSelectRow(mID, aRow);
+  Unused << mDoc->SendTableSelectRow(mID, aRow);
 }
 
 void
 ProxyAccessible::TableUnselectColumn(uint32_t aCol)
 {
-  unused << mDoc->SendTableUnselectColumn(mID, aCol);
+  Unused << mDoc->SendTableUnselectColumn(mID, aCol);
 }
 
 void
 ProxyAccessible::TableUnselectRow(uint32_t aRow)
 {
-  unused << mDoc->SendTableUnselectRow(mID, aRow);
+  Unused << mDoc->SendTableUnselectRow(mID, aRow);
 }
 
 bool
 ProxyAccessible::TableIsProbablyForLayout()
 {
   bool forLayout = false;
-  unused << mDoc->SendTableIsProbablyForLayout(mID, &forLayout);
+  Unused << mDoc->SendTableIsProbablyForLayout(mID, &forLayout);
   return forLayout;
 }
 
 ProxyAccessible*
 ProxyAccessible::AtkTableColumnHeader(int32_t aCol)
 {
   uint64_t headerID = 0;
   bool ok = false;
-  unused << mDoc->SendAtkTableColumnHeader(mID, aCol, &headerID, &ok);
+  Unused << mDoc->SendAtkTableColumnHeader(mID, aCol, &headerID, &ok);
   return ok ? mDoc->GetAccessible(headerID) : nullptr;
 }
 
 ProxyAccessible*
 ProxyAccessible::AtkTableRowHeader(int32_t aRow)
 {
   uint64_t headerID = 0;
   bool ok = false;
-  unused << mDoc->SendAtkTableRowHeader(mID, aRow, &headerID, &ok);
+  Unused << mDoc->SendAtkTableRowHeader(mID, aRow, &headerID, &ok);
   return ok ? mDoc->GetAccessible(headerID) : nullptr;
 }
 
 void
 ProxyAccessible::SelectedItems(nsTArray<ProxyAccessible*>* aSelectedItems)
 {
   nsAutoTArray<uint64_t, 10> itemIDs;
-  unused << mDoc->SendSelectedItems(mID, &itemIDs);
+  Unused << mDoc->SendSelectedItems(mID, &itemIDs);
   aSelectedItems->SetCapacity(itemIDs.Length());
   for (size_t i = 0; i < itemIDs.Length(); ++i) {
     aSelectedItems->AppendElement(mDoc->GetAccessible(itemIDs[i]));
   }
 }
 
 uint32_t
 ProxyAccessible::SelectedItemCount()
 {
   uint32_t count = 0;
-  unused << mDoc->SendSelectedItemCount(mID, &count);
+  Unused << mDoc->SendSelectedItemCount(mID, &count);
   return count;
 }
 
 ProxyAccessible*
 ProxyAccessible::GetSelectedItem(uint32_t aIndex)
 {
   uint64_t selectedItemID = 0;
   bool ok = false;
-  unused << mDoc->SendGetSelectedItem(mID, aIndex, &selectedItemID, &ok);
+  Unused << mDoc->SendGetSelectedItem(mID, aIndex, &selectedItemID, &ok);
   return ok ? mDoc->GetAccessible(selectedItemID) : nullptr;
 }
 
 bool
 ProxyAccessible::IsItemSelected(uint32_t aIndex)
 {
   bool selected = false;
-  unused << mDoc->SendIsItemSelected(mID, aIndex, &selected);
+  Unused << mDoc->SendIsItemSelected(mID, aIndex, &selected);
   return selected;
 }
  
 bool
 ProxyAccessible::AddItemToSelection(uint32_t aIndex)
 {
   bool success = false;
-  unused << mDoc->SendAddItemToSelection(mID, aIndex, &success);
+  Unused << mDoc->SendAddItemToSelection(mID, aIndex, &success);
   return success;
 }
 
 bool
 ProxyAccessible::RemoveItemFromSelection(uint32_t aIndex)
 {
   bool success = false;
-  unused << mDoc->SendRemoveItemFromSelection(mID, aIndex, &success);
+  Unused << mDoc->SendRemoveItemFromSelection(mID, aIndex, &success);
   return success;
 }
 
 bool
 ProxyAccessible::SelectAll()
 {
   bool success = false;
-  unused << mDoc->SendSelectAll(mID, &success);
+  Unused << mDoc->SendSelectAll(mID, &success);
   return success;
 }
 
 bool
 ProxyAccessible::UnselectAll()
 {
   bool success = false;
-  unused << mDoc->SendUnselectAll(mID, &success);
+  Unused << mDoc->SendUnselectAll(mID, &success);
   return success;
 }
 
 void
 ProxyAccessible::TakeSelection()
 {
-  unused << mDoc->SendTakeSelection(mID);
+  Unused << mDoc->SendTakeSelection(mID);
 }
 
 void
 ProxyAccessible::SetSelected(bool aSelect)
 {
-  unused << mDoc->SendSetSelected(mID, aSelect);
+  Unused << mDoc->SendSetSelected(mID, aSelect);
 }
 
 bool
 ProxyAccessible::DoAction(uint8_t aIndex)
 {
   bool success = false;
-  unused << mDoc->SendDoAction(mID, aIndex, &success);
+  Unused << mDoc->SendDoAction(mID, aIndex, &success);
   return success;
 }
 
 uint8_t
 ProxyAccessible::ActionCount()
 {
   uint8_t count = 0;
-  unused << mDoc->SendActionCount(mID, &count);
+  Unused << mDoc->SendActionCount(mID, &count);
   return count;
 }
 
 void
 ProxyAccessible::ActionDescriptionAt(uint8_t aIndex, nsString& aDescription)
 {
-  unused << mDoc->SendActionDescriptionAt(mID, aIndex, &aDescription);
+  Unused << mDoc->SendActionDescriptionAt(mID, aIndex, &aDescription);
 }
 
 void
 ProxyAccessible::ActionNameAt(uint8_t aIndex, nsString& aName)
 {
-  unused << mDoc->SendActionNameAt(mID, aIndex, &aName);
+  Unused << mDoc->SendActionNameAt(mID, aIndex, &aName);
 }
 
 KeyBinding
 ProxyAccessible::AccessKey()
 {
   uint32_t key = 0;
   uint32_t modifierMask = 0;
-  unused << mDoc->SendAccessKey(mID, &key, &modifierMask);
+  Unused << mDoc->SendAccessKey(mID, &key, &modifierMask);
   return KeyBinding(key, modifierMask);
 }
 
 KeyBinding
 ProxyAccessible::KeyboardShortcut()
 {
   uint32_t key = 0;
   uint32_t modifierMask = 0;
-  unused << mDoc->SendKeyboardShortcut(mID, &key, &modifierMask);
+  Unused << mDoc->SendKeyboardShortcut(mID, &key, &modifierMask);
   return KeyBinding(key, modifierMask);
 }
 
 void
 ProxyAccessible::AtkKeyBinding(nsString& aBinding)
 {
-  unused << mDoc->SendAtkKeyBinding(mID, &aBinding);
+  Unused << mDoc->SendAtkKeyBinding(mID, &aBinding);
 }
 
 double
 ProxyAccessible::CurValue()
 {
   double val = UnspecifiedNaN<double>();
-  unused << mDoc->SendCurValue(mID, &val);
+  Unused << mDoc->SendCurValue(mID, &val);
   return val;
 }
 
 bool
 ProxyAccessible::SetCurValue(double aValue)
 {
   bool success = false;
-  unused << mDoc->SendSetCurValue(mID, aValue, &success);
+  Unused << mDoc->SendSetCurValue(mID, aValue, &success);
   return success;
 }
 
 double
 ProxyAccessible::MinValue()
 {
   double val = UnspecifiedNaN<double>();
-  unused << mDoc->SendMinValue(mID, &val);
+  Unused << mDoc->SendMinValue(mID, &val);
   return val;
 }
 
 double
 ProxyAccessible::MaxValue()
 {
   double val = UnspecifiedNaN<double>();
-  unused << mDoc->SendMaxValue(mID, &val);
+  Unused << mDoc->SendMaxValue(mID, &val);
   return val;
 }
 
 double
 ProxyAccessible::Step()
 {
   double step = UnspecifiedNaN<double>();
-  unused << mDoc->SendStep(mID, &step);
+  Unused << mDoc->SendStep(mID, &step);
   return step;
 }
 
 void
 ProxyAccessible::TakeFocus()
 {
-  unused << mDoc->SendTakeFocus(mID);
+  Unused << mDoc->SendTakeFocus(mID);
 }
 
 uint32_t
 ProxyAccessible::EmbeddedChildCount() const
 {
   uint32_t count;
-  unused << mDoc->SendEmbeddedChildCount(mID, &count);
+  Unused << mDoc->SendEmbeddedChildCount(mID, &count);
   return count;
 }
 
 int32_t
 ProxyAccessible::IndexOfEmbeddedChild(const ProxyAccessible* aChild)
 {
   uint64_t childID = aChild->mID;
   uint32_t childIdx;
-  unused << mDoc->SendIndexOfEmbeddedChild(mID, childID, &childIdx);
+  Unused << mDoc->SendIndexOfEmbeddedChild(mID, childID, &childIdx);
   return childIdx;
 }
 
 ProxyAccessible*
 ProxyAccessible::EmbeddedChildAt(size_t aChildIdx)
 {
   // For an outer doc the only child is a document, which is of course an
   // embedded child.  Further asking the child process for the id of the child
   // document won't work because the id of the child doc will be 0, which we
   // would interpret as being our parent document.
   if (mOuterDoc) {
     return ChildAt(aChildIdx);
   }
 
   uint64_t childID;
-  unused << mDoc->SendEmbeddedChildAt(mID, aChildIdx, &childID);
+  Unused << mDoc->SendEmbeddedChildAt(mID, aChildIdx, &childID);
   return mDoc->GetAccessible(childID);
 }
 
 ProxyAccessible*
 ProxyAccessible::FocusedChild()
 {
   uint64_t childID = 0;
   bool ok = false;
-  unused << mDoc->SendFocusedChild(mID, &childID, &ok);
+  Unused << mDoc->SendFocusedChild(mID, &childID, &ok);
   return ok ? mDoc->GetAccessible(childID) : nullptr;
 }
 
 ProxyAccessible*
 ProxyAccessible::ChildAtPoint(int32_t aX, int32_t aY,
                               Accessible::EWhichChildAtPoint aWhichChild)
 {
   uint64_t childID = 0;
   bool ok = false;
-  unused << mDoc->SendAccessibleAtPoint(mID, aX, aY, false,
+  Unused << mDoc->SendAccessibleAtPoint(mID, aX, aY, false,
                                         static_cast<uint32_t>(aWhichChild),
                                         &childID, &ok);
   return ok ? mDoc->GetAccessible(childID) : nullptr;
 }
 
 nsIntRect
 ProxyAccessible::Bounds()
 {
   nsIntRect rect;
-  unused << mDoc->SendExtents(mID, false,
+  Unused << mDoc->SendExtents(mID, false,
                               &(rect.x), &(rect.y),
                               &(rect.width), &(rect.height));
   return rect;
 }
 
 void
 ProxyAccessible::Language(nsString& aLocale)
 {
-  unused << mDoc->SendLanguage(mID, &aLocale);
+  Unused << mDoc->SendLanguage(mID, &aLocale);
 }
 
 void
 ProxyAccessible::DocType(nsString& aType)
 {
-  unused << mDoc->SendDocType(mID, &aType);
+  Unused << mDoc->SendDocType(mID, &aType);
 }
 
 void
 ProxyAccessible::Title(nsString& aTitle)
 {
-  unused << mDoc->SendTitle(mID, &aTitle);
+  Unused << mDoc->SendTitle(mID, &aTitle);
 }
 
 void
 ProxyAccessible::URL(nsString& aURL)
 {
-  unused << mDoc->SendURL(mID, &aURL);
+  Unused << mDoc->SendURL(mID, &aURL);
 }
 
 void
 ProxyAccessible::MimeType(nsString aMime)
 {
-  unused << mDoc->SendMimeType(mID, &aMime);
+  Unused << mDoc->SendMimeType(mID, &aMime);
 }
 
 void
 ProxyAccessible::URLDocTypeMimeType(nsString& aURL, nsString& aDocType,
                                     nsString& aMimeType)
 {
-  unused << mDoc->SendURLDocTypeMimeType(mID, &aURL, &aDocType, &aMimeType);
+  Unused << mDoc->SendURLDocTypeMimeType(mID, &aURL, &aDocType, &aMimeType);
 }
 
 ProxyAccessible*
 ProxyAccessible::AccessibleAtPoint(int32_t aX, int32_t aY,
                                    bool aNeedsScreenCoords)
 {
   uint64_t childID = 0;
   bool ok = false;
-  unused <<
+  Unused <<
     mDoc->SendAccessibleAtPoint(mID, aX, aY, aNeedsScreenCoords,
                                 static_cast<uint32_t>(Accessible::eDirectChild),
                                 &childID, &ok);
   return ok ? mDoc->GetAccessible(childID) : nullptr;
 }
 
 void
 ProxyAccessible::Extents(bool aNeedsScreenCoords, int32_t* aX, int32_t* aY,
                         int32_t* aWidth, int32_t* aHeight)
 {
-  unused << mDoc->SendExtents(mID, aNeedsScreenCoords, aX, aY, aWidth, aHeight);
+  Unused << mDoc->SendExtents(mID, aNeedsScreenCoords, aX, aY, aWidth, aHeight);
 }
 
 Accessible*
 ProxyAccessible::OuterDocOfRemoteBrowser() const
 {
   auto tab = static_cast<dom::TabParent*>(mDoc->Manager());
   dom::Element* frame = tab->GetOwnerElement();
   NS_ASSERTION(frame, "why isn't the tab in a frame!");

--- a/caps/DomainPolicy.cpp
+++ b/caps/DomainPolicy.cpp
@@ -30,17 +30,17 @@ BroadcastDomainSetChange(DomainSetType a
     if (!parents.Length()) {
        return NS_OK;
     }
 
     OptionalURIParams uri;
     SerializeURI(aDomain, uri);
 
     for (uint32_t i = 0; i < parents.Length(); i++) {
-        unused << parents[i]->SendDomainSetChanged(aSetType, aChangeType, uri);
+        Unused << parents[i]->SendDomainSetChanged(aSetType, aChangeType, uri);
     }
     return NS_OK;
 }
 
 DomainPolicy::DomainPolicy() : mBlacklist(new DomainSet(BLACKLIST))
                              , mSuperBlacklist(new DomainSet(SUPER_BLACKLIST))
                              , mWhitelist(new DomainSet(WHITELIST))
                              , mSuperWhitelist(new DomainSet(SUPER_WHITELIST))

--- a/chrome/nsChromeRegistryChrome.cpp
+++ b/chrome/nsChromeRegistryChrome.cpp
@@ -744,17 +744,17 @@ static void
 SendManifestEntry(const ChromeRegistryItem &aItem)
 {
   nsTArray<ContentParent*> parents;
   ContentParent::GetAll(parents);
   if (!parents.Length())
     return;
 
   for (uint32_t i = 0; i < parents.Length(); i++) {
-    unused << parents[i]->SendRegisterChromeItem(aItem);
+    Unused << parents[i]->SendRegisterChromeItem(aItem);
   }
 }
 
 void
 nsChromeRegistryChrome::ManifestContent(ManifestProcessingContext& cx, int lineno,
                                         char *const * argv, int flags)
 {
   char* package = argv[0];

--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -5102,17 +5102,17 @@ nsDocShell::DisplayLoadError(nsresult aE
     // Display an error page
     LoadErrorPage(aURI, aURL, errorPage.get(), error.get(),
                   messageStr.get(), cssClass.get(), aFailedChannel);
   } else {
     // The prompter reqires that our private window has a document (or it
     // asserts). Satisfy that assertion now since GetDoc will force
     // creation of one if it hasn't already been created.
     if (mScriptGlobal) {
-      unused << mScriptGlobal->GetDoc();
+      Unused << mScriptGlobal->GetDoc();
     }
 
     // Display a message box
     prompter->Alert(nullptr, messageStr.get());
   }
 
   return NS_OK;
 }

--- a/dom/asmjscache/AsmJSCache.cpp
+++ b/dom/asmjscache/AsmJSCache.cpp
@@ -51,17 +51,17 @@ using mozilla::dom::quota::PersistenceTy
 using mozilla::dom::quota::QuotaManager;
 using mozilla::dom::quota::QuotaObject;
 using mozilla::dom::quota::UsageInfo;
 using mozilla::ipc::AssertIsOnBackgroundThread;
 using mozilla::ipc::BackgroundChild;
 using mozilla::ipc::IsOnBackgroundThread;
 using mozilla::ipc::PBackgroundChild;
 using mozilla::ipc::PrincipalInfo;
-using mozilla::unused;
+using mozilla::Unused;
 using mozilla::HashString;
 
 namespace mozilla {
 
 MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedPRFileDesc, PRFileDesc, PR_Close);
 
 namespace dom {
 namespace asmjscache {
@@ -473,17 +473,17 @@ private:
 
     mState = eFinished;
 
     MOZ_ASSERT(!mOpened);
 
     FinishOnOwningThread();
 
     if (!mActorDestroyed) {
-      unused << Send__delete__(this, mResult);
+      Unused << Send__delete__(this, mResult);
     }
   }
 
   // The same as method above but is intended to be called off the owning
   // thread.
   void
   FailOnNonOwningThread()
   {
@@ -988,17 +988,17 @@ ParentRunnable::Run()
     case eSendingMetadataForRead: {
       AssertIsOnOwningThread();
       MOZ_ASSERT(mOpenMode == eOpenForRead);
 
       mState = eWaitingToOpenCacheFileForRead;
 
       // Metadata is now open.
       if (!SendOnOpenMetadataForRead(mMetadata)) {
-        unused << Send__delete__(this, JS::AsmJSCache_InternalError);
+        Unused << Send__delete__(this, JS::AsmJSCache_InternalError);
       }
 
       return NS_OK;
     }
 
     case eDispatchToMainThread: {
       MOZ_ASSERT(NS_IsMainThread());
 
@@ -1030,17 +1030,17 @@ ParentRunnable::Run()
 
       // The entry is now open.
       MOZ_ASSERT(!mOpened);
       mOpened = true;
 
       FileDescriptor::PlatformHandleType handle =
         FileDescriptor::PlatformHandleType(PR_FileDesc2NativeHandle(mFileDesc));
       if (!SendOnOpenCacheFile(mFileSize, FileDescriptor(handle))) {
-        unused << Send__delete__(this, JS::AsmJSCache_InternalError);
+        Unused << Send__delete__(this, JS::AsmJSCache_InternalError);
       }
 
       return NS_OK;
     }
 
     case eFailing: {
       AssertIsOnOwningThread();
 
@@ -1446,17 +1446,17 @@ ChildRunnable::Run()
       mOpened = false;
 
       // Match the AddRef in BlockUntilOpen(). The main thread event loop still
       // holds an outstanding ref which will keep 'this' alive until returning to
       // the event loop.
       Release();
 
       if (!mActorDestroyed) {
-        unused << Send__delete__(this, JS::AsmJSCache_Success);
+        Unused << Send__delete__(this, JS::AsmJSCache_Success);
       }
 
       mState = eFinished;
       return NS_OK;
     }
 
     case eBackgroundChildPending:
     case eOpening:

--- a/dom/base/ImageEncoder.cpp
+++ b/dom/base/ImageEncoder.cpp
@@ -205,17 +205,17 @@ public:
     if (NS_FAILED(rv)) {
       mEncodingCompleteEvent->SetFailed();
     } else {
       mEncodingCompleteEvent->SetMembers(imgData, imgSize, mType);
     }
     rv = NS_DispatchToMainThread(mEncodingCompleteEvent);
     if (NS_FAILED(rv)) {
       // Better to leak than to crash.
-      unused << mEncodingCompleteEvent.forget();
+      Unused << mEncodingCompleteEvent.forget();
       return rv;
     }
 
     return rv;
   }
 
 private:
   nsAutoString mType;

--- a/dom/base/nsContentPermissionHelper.cpp
+++ b/dom/base/nsContentPermissionHelper.cpp
@@ -28,17 +28,17 @@
 #include "nsContentPermissionHelper.h"
 #include "nsJSUtils.h"
 #include "nsISupportsPrimitives.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIDocument.h"
 #include "nsIDOMEvent.h"
 #include "nsWeakPtr.h"
 
-using mozilla::unused;          // <snicker>
+using mozilla::Unused;          // <snicker>
 using namespace mozilla::dom;
 using namespace mozilla;
 
 #define kVisibilityChange "visibilitychange"
 
 NS_IMPL_ISUPPORTS(VisibilityChangeListener, nsIDOMEventListener)
 
 VisibilityChangeListener::VisibilityChangeListener(nsPIDOMWindow* aWindow)
@@ -468,17 +468,17 @@ NS_IMPL_ISUPPORTS(nsContentPermissionReq
 NS_IMETHODIMP
 nsContentPermissionRequestProxy::nsContentPermissionRequesterProxy
   ::GetVisibility(nsIContentPermissionRequestCallback* aCallback)
 {
   NS_ENSURE_ARG_POINTER(aCallback);
 
   mGetCallback = aCallback;
   mWaitGettingResult = true;
-  unused << mParent->SendGetVisibility();
+  Unused << mParent->SendGetVisibility();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsContentPermissionRequestProxy::nsContentPermissionRequesterProxy
   ::SetOnVisibilityChange(nsIContentPermissionRequestCallback* aCallback)
 {
   mOnChangeCallback = aCallback;
@@ -603,17 +603,17 @@ nsContentPermissionRequestProxy::Cancel(
   // Don't send out the delete message when the managing protocol (PBrowser) is
   // being destroyed and PContentPermissionRequest will soon be.
   if (mParent->IsBeingDestroyed()) {
     return NS_ERROR_FAILURE;
   }
 
   nsTArray<PermissionChoice> emptyChoices;
 
-  unused << ContentPermissionRequestParent::Send__delete__(mParent, false, emptyChoices);
+  Unused << ContentPermissionRequestParent::Send__delete__(mParent, false, emptyChoices);
   mParent = nullptr;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsContentPermissionRequestProxy::Allow(JS::HandleValue aChoices)
 {
   if (mParent == nullptr) {
@@ -667,17 +667,17 @@ nsContentPermissionRequestProxy::Allow(J
         choices.AppendElement(PermissionChoice(type, choice));
       }
     }
   } else {
     MOZ_ASSERT(false, "SelectedChoices should be undefined or an JS object");
     return NS_ERROR_FAILURE;
   }
 
-  unused << ContentPermissionRequestParent::Send__delete__(mParent, true, choices);
+  Unused << ContentPermissionRequestParent::Send__delete__(mParent, true, choices);
   mParent = nullptr;
   return NS_OK;
 }
 
 void
 nsContentPermissionRequestProxy::NotifyVisibility(const bool& aIsVisible)
 {
   MOZ_ASSERT(mRequester);
@@ -771,22 +771,22 @@ RemotePermissionRequest::RecvGetVisibili
 {
   nsCOMPtr<nsIDocShell> docshell = mWindow->GetDocShell();
   if (!docshell) {
     return false;
   }
 
   bool isActive = false;
   docshell->GetIsActive(&isActive);
-  unused << SendNotifyVisibility(isActive);
+  Unused << SendNotifyVisibility(isActive);
   return true;
 }
 
 NS_IMETHODIMP
 RemotePermissionRequest::NotifyVisibility(bool isVisible)
 {
   if (!mIPCOpen) {
     return NS_OK;
   }
 
-  unused << SendNotifyVisibility(isVisible);
+  Unused << SendNotifyVisibility(isVisible);
   return NS_OK;
 }

--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1118,17 +1118,17 @@ nsFocusManager::EnsureCurrentWidgetFocus
     }
   }
 }
 
 void
 ActivateOrDeactivateChild(TabParent* aParent, void* aArg)
 {
   bool active = static_cast<bool>(aArg);
-  unused << aParent->SendParentActivated(active);
+  Unused << aParent->SendParentActivated(active);
 }
 
 void
 nsFocusManager::ActivateOrDeactivate(nsPIDOMWindow* aWindow, bool aActive)
 {
   if (!aWindow) {
     return;
   }

--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -985,18 +985,18 @@ nsFrameLoader::SwapWithOtherRemoteLoader
   ourShell->BackingScaleFactorChanged();
   otherShell->BackingScaleFactorChanged();
 
   ourDoc->FlushPendingNotifications(Flush_Layout);
   otherDoc->FlushPendingNotifications(Flush_Layout);
 
   mInSwap = aOther->mInSwap = false;
 
-  unused << mRemoteBrowser->SendSwappedWithOtherRemoteLoader();
-  unused << aOther->mRemoteBrowser->SendSwappedWithOtherRemoteLoader();
+  Unused << mRemoteBrowser->SendSwappedWithOtherRemoteLoader();
+  Unused << aOther->mRemoteBrowser->SendSwappedWithOtherRemoteLoader();
   return NS_OK;
 }
 
 class MOZ_RAII AutoResetInFrameSwap final
 {
 public:
   AutoResetInFrameSwap(nsFrameLoader* aThisFrameLoader,
                        nsFrameLoader* aOtherFrameLoader,
@@ -2291,17 +2291,17 @@ nsFrameLoader::TryRemoteBrowser()
     rootChromeWin->GetBrowserDOMWindow(getter_AddRefs(browserDOMWin));
     mRemoteBrowser->SetBrowserDOMWindow(browserDOMWin);
   }
 
   if (mOwnerContent->AttrValueIs(kNameSpaceID_None,
                                  nsGkAtoms::mozpasspointerevents,
                                  nsGkAtoms::_true,
                                  eCaseMatters)) {
-    unused << mRemoteBrowser->SendSetUpdateHitRegion(true);
+    Unused << mRemoteBrowser->SendSetUpdateHitRegion(true);
   }
 
   ReallyLoadFrameScripts();
   InitializeBrowserAPI();
 
  return true;
 }
 
@@ -2336,24 +2336,24 @@ nsFrameLoader::DeactivateRemoteFrame() {
     return NS_OK;
   }
   return NS_ERROR_UNEXPECTED;
 }
 
 void
 nsFrameLoader::ActivateUpdateHitRegion() {
   if (mRemoteBrowser) {
-    unused << mRemoteBrowser->SendSetUpdateHitRegion(true);
+    Unused << mRemoteBrowser->SendSetUpdateHitRegion(true);
   }
 }
 
 void
 nsFrameLoader::DeactivateUpdateHitRegion() {
   if (mRemoteBrowser) {
-    unused << mRemoteBrowser->SendSetUpdateHitRegion(false);
+    Unused << mRemoteBrowser->SendSetUpdateHitRegion(false);
   }
 }
 
 NS_IMETHODIMP
 nsFrameLoader::SendCrossProcessMouseEvent(const nsAString& aType,
                                           float aX,
                                           float aY,
                                           int32_t aButton,
@@ -2852,17 +2852,17 @@ nsFrameLoader::ResetPermissionManagerSta
 /**
  * Send the RequestNotifyAfterRemotePaint message to the current Tab.
  */
 NS_IMETHODIMP
 nsFrameLoader::RequestNotifyAfterRemotePaint()
 {
   // If remote browsing (e10s), handle this with the TabParent.
   if (mRemoteBrowser) {
-    unused << mRemoteBrowser->SendRequestNotifyAfterRemotePaint();
+    Unused << mRemoteBrowser->SendRequestNotifyAfterRemotePaint();
   }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsFrameLoader::RequestNotifyLayerTreeReady()
 {

--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -11618,17 +11618,17 @@ nsGlobalWindow::SetTimeoutOrInterval(nsI
     RefPtr<nsTimeout> copy = timeout;
 
     rv = timeout->InitTimer(realInterval);
     if (NS_FAILED(rv)) {
       return rv;
     }
 
     // The timeout is now also held in the timer's closure.
-    unused << copy.forget();
+    Unused << copy.forget();
   } else {
     // If we are frozen, however, then we instead simply set
     // timeout->mTimeRemaining to be the "time remaining" in the timeout (i.e.,
     // the interval itself). We don't create a timer for it, since that will
     // happen when we are thawed and the timeout will then get a timer and run
     // to completion.
 
     timeout->mTimeRemaining = delta;
@@ -12024,17 +12024,17 @@ nsGlobalWindow::RunTimeout(nsTimeout *aT
     bool timeout_was_cleared = RunTimeoutHandler(timeout, scx);
 
     if (timeout_was_cleared) {
       // The running timeout's window was cleared, this means that
       // ClearAllTimeouts() was called from a *nested* call, possibly
       // through a timeout that fired while a modal (to this window)
       // dialog was open or through other non-obvious paths.
       MOZ_ASSERT(dummy_timeout->HasRefCntOne(), "dummy_timeout may leak");
-      unused << timeoutExtraRef.forget().take();
+      Unused << timeoutExtraRef.forget().take();
 
       mTimeoutInsertionPoint = last_insertion_point;
 
       return;
     }
 
     // If we have a regular interval timer, we re-schedule the
     // timeout, accounting for clock drift.

--- a/dom/base/nsScriptLoader.cpp
+++ b/dom/base/nsScriptLoader.cpp
@@ -814,18 +814,18 @@ NotifyOffThreadScriptLoadCompletedRunnab
     nsCOMPtr<nsIThread> mainThread;
     NS_GetMainThread(getter_AddRefs(mainThread));
     if (mainThread) {
       NS_ProxyRelease(mainThread, mRequest);
       NS_ProxyRelease(mainThread, mLoader);
     } else {
       MOZ_ASSERT(false, "We really shouldn't leak!");
       // Better to leak than crash.
-      unused << mRequest.forget();
-      unused << mLoader.forget();
+      Unused << mRequest.forget();
+      Unused << mLoader.forget();
     }
   }
 }
 
 NS_IMETHODIMP
 NotifyOffThreadScriptLoadCompletedRunnable::Run()
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -885,17 +885,17 @@ nsScriptLoader::AttemptAsyncScriptCompil
                             OffThreadScriptLoaderCallback,
                             static_cast<void*>(runnable))) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
   mDocument->BlockOnload();
   aRequest->mProgress = nsScriptLoadRequest::Progress_Compiling;
 
-  unused << runnable.forget();
+  Unused << runnable.forget();
   return NS_OK;
 }
 
 nsresult
 nsScriptLoader::CompileOffThreadOrProcessRequest(nsScriptLoadRequest* aRequest,
                                                  bool* oCompiledOffThread)
 {
   NS_ASSERTION(nsContentUtils::IsSafeToRunScript(),

--- a/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.cpp
@@ -60,17 +60,17 @@ BluetoothDaemonA2dpModule::ConnectCmd(
   nsresult rv = PackPDU(aRemoteAddr, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonA2dpModule::DisconnectCmd(
   const BluetoothAddress& aRemoteAddr, BluetoothA2dpResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -81,17 +81,17 @@ BluetoothDaemonA2dpModule::DisconnectCmd
   nsresult rv = PackPDU(aRemoteAddr, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 // Responses
 //
 
 void
 BluetoothDaemonA2dpModule::ErrorRsp(

--- a/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp
@@ -63,17 +63,17 @@ BluetoothDaemonAvrcpModule::GetPlayStatu
   nsresult rv = PackPDU(aPlayStatus, aSongLen, aSongPos, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonAvrcpModule::ListPlayerAppAttrRspCmd(
   int aNumAttr, const BluetoothAvrcpPlayerAttribute* aPAttrs,
   BluetoothAvrcpResultHandler* aRes)
 {
@@ -89,17 +89,17 @@ BluetoothDaemonAvrcpModule::ListPlayerAp
     PackArray<BluetoothAvrcpPlayerAttribute>(aPAttrs, aNumAttr), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonAvrcpModule::ListPlayerAppValueRspCmd(
   int aNumVal, uint8_t* aPVals, BluetoothAvrcpResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -113,17 +113,17 @@ BluetoothDaemonAvrcpModule::ListPlayerAp
                         PackArray<uint8_t>(aPVals, aNumVal), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonAvrcpModule::GetPlayerAppValueRspCmd(
   uint8_t aNumAttrs, const uint8_t* aIds, const uint8_t* aValues,
   BluetoothAvrcpResultHandler* aRes)
 {
@@ -138,17 +138,17 @@ BluetoothDaemonAvrcpModule::GetPlayerApp
     BluetoothAvrcpAttributeValuePairs(aIds, aValues, aNumAttrs), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonAvrcpModule::GetPlayerAppAttrTextRspCmd(
   int aNumAttr, const uint8_t* aIds, const char** aTexts,
   BluetoothAvrcpResultHandler* aRes)
 {
@@ -162,17 +162,17 @@ BluetoothDaemonAvrcpModule::GetPlayerApp
     BluetoothAvrcpAttributeTextPairs(aIds, aTexts, aNumAttr), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonAvrcpModule::GetPlayerAppValueTextRspCmd(
   int aNumVal, const uint8_t* aIds, const char** aTexts,
   BluetoothAvrcpResultHandler* aRes)
 {
@@ -186,17 +186,17 @@ BluetoothDaemonAvrcpModule::GetPlayerApp
     BluetoothAvrcpAttributeTextPairs(aIds, aTexts, aNumVal), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonAvrcpModule::GetElementAttrRspCmd(
   uint8_t aNumAttr, const BluetoothAvrcpElementAttribute* aAttr,
   BluetoothAvrcpResultHandler* aRes)
 {
@@ -210,17 +210,17 @@ BluetoothDaemonAvrcpModule::GetElementAt
     PackArray<BluetoothAvrcpElementAttribute>(aAttr, aNumAttr), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonAvrcpModule::SetPlayerAppValueRspCmd(
   BluetoothAvrcpStatus aRspStatus, BluetoothAvrcpResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -232,17 +232,17 @@ BluetoothDaemonAvrcpModule::SetPlayerApp
   nsresult rv = PackPDU(aRspStatus, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonAvrcpModule::RegisterNotificationRspCmd(
   BluetoothAvrcpEvent aEvent, BluetoothAvrcpNotification aType,
   const BluetoothAvrcpNotificationParam& aParam,
   BluetoothAvrcpResultHandler* aRes)
@@ -261,17 +261,17 @@ BluetoothDaemonAvrcpModule::RegisterNoti
                         data, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonAvrcpModule::SetVolumeCmd(uint8_t aVolume,
                                          BluetoothAvrcpResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -283,17 +283,17 @@ BluetoothDaemonAvrcpModule::SetVolumeCmd
   nsresult rv = PackPDU(aVolume, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 // Responses
 //
 
 void
 BluetoothDaemonAvrcpModule::ErrorRsp(

--- a/dom/bluetooth/bluedroid/BluetoothDaemonCoreInterface.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonCoreInterface.cpp
@@ -60,34 +60,34 @@ BluetoothDaemonCoreModule::EnableCmd(Blu
   nsAutoPtr<DaemonSocketPDU> pdu(
     new DaemonSocketPDU(SERVICE_ID, OPCODE_ENABLE,
                         0));
 
   nsresult rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::DisableCmd(BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   nsAutoPtr<DaemonSocketPDU> pdu(
     new DaemonSocketPDU(SERVICE_ID, OPCODE_DISABLE,
                         0));
 
   nsresult rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::GetAdapterPropertiesCmd(
   BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -95,17 +95,17 @@ BluetoothDaemonCoreModule::GetAdapterPro
   nsAutoPtr<DaemonSocketPDU> pdu(
     new DaemonSocketPDU(SERVICE_ID, OPCODE_GET_ADAPTER_PROPERTIES,
                         0));
 
   nsresult rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::GetAdapterPropertyCmd(BluetoothPropertyType aType,
                                                  BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -117,17 +117,17 @@ BluetoothDaemonCoreModule::GetAdapterPro
   nsresult rv = PackPDU(aType, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::SetAdapterPropertyCmd(
   const BluetoothProperty& aProperty, BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -139,17 +139,17 @@ BluetoothDaemonCoreModule::SetAdapterPro
   nsresult rv = PackPDU(aProperty, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::GetRemoteDevicePropertiesCmd(
   const BluetoothAddress& aRemoteAddr, BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -161,17 +161,17 @@ BluetoothDaemonCoreModule::GetRemoteDevi
   nsresult rv = PackPDU(aRemoteAddr, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::GetRemoteDevicePropertyCmd(
   const BluetoothAddress& aRemoteAddr,
   BluetoothPropertyType aType,
   BluetoothResultHandler* aRes)
@@ -185,17 +185,17 @@ BluetoothDaemonCoreModule::GetRemoteDevi
   nsresult rv = PackPDU(aRemoteAddr, aType, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::SetRemoteDevicePropertyCmd(
   const BluetoothAddress& aRemoteAddr,
   const BluetoothProperty& aProperty,
   BluetoothResultHandler* aRes)
@@ -209,17 +209,17 @@ BluetoothDaemonCoreModule::SetRemoteDevi
   nsresult rv = PackPDU(aRemoteAddr, aProperty, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::GetRemoteServiceRecordCmd(
   const BluetoothAddress& aRemoteAddr, const BluetoothUuid& aUuid,
   BluetoothResultHandler* aRes)
 {
@@ -232,17 +232,17 @@ BluetoothDaemonCoreModule::GetRemoteServ
   nsresult rv = PackPDU(aRemoteAddr, aUuid, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::GetRemoteServicesCmd(
   const BluetoothAddress& aRemoteAddr, BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -253,51 +253,51 @@ BluetoothDaemonCoreModule::GetRemoteServ
   nsresult rv = PackPDU(aRemoteAddr, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::StartDiscoveryCmd(BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   nsAutoPtr<DaemonSocketPDU> pdu(
     new DaemonSocketPDU(SERVICE_ID, OPCODE_START_DISCOVERY,
                         0));
 
   nsresult rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::CancelDiscoveryCmd(BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   nsAutoPtr<DaemonSocketPDU> pdu(
     new DaemonSocketPDU(SERVICE_ID, OPCODE_CANCEL_DISCOVERY,
                         0));
 
   nsresult rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::CreateBondCmd(const BluetoothAddress& aBdAddr,
                                          BluetoothTransport aTransport,
                                          BluetoothResultHandler* aRes)
 {
@@ -314,17 +314,17 @@ BluetoothDaemonCoreModule::CreateBondCmd
 #endif
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::RemoveBondCmd(const BluetoothAddress& aBdAddr,
                                          BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -336,17 +336,17 @@ BluetoothDaemonCoreModule::RemoveBondCmd
   nsresult rv = PackPDU(aBdAddr, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::CancelBondCmd(const BluetoothAddress& aBdAddr,
                                          BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -358,17 +358,17 @@ BluetoothDaemonCoreModule::CancelBondCmd
   nsresult rv = PackPDU(aBdAddr, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::PinReplyCmd(const BluetoothAddress& aBdAddr,
                                        bool aAccept,
                                        const BluetoothPinCode& aPinCode,
                                        BluetoothResultHandler* aRes)
@@ -382,17 +382,17 @@ BluetoothDaemonCoreModule::PinReplyCmd(c
   nsresult rv = PackPDU(aBdAddr, aAccept, aPinCode, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::SspReplyCmd(const BluetoothAddress& aBdAddr,
                                        BluetoothSspVariant aVariant,
                                        bool aAccept, uint32_t aPasskey,
                                        BluetoothResultHandler* aRes)
@@ -406,17 +406,17 @@ BluetoothDaemonCoreModule::SspReplyCmd(c
   nsresult rv = PackPDU(aBdAddr, aVariant, aAccept, aPasskey, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::DutModeConfigureCmd(bool aEnable,
                                                BluetoothResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -428,17 +428,17 @@ BluetoothDaemonCoreModule::DutModeConfig
   nsresult rv = PackPDU(aEnable, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::DutModeSendCmd(uint16_t aOpcode,
                                           uint8_t* aBuf, uint8_t aLen,
                                           BluetoothResultHandler* aRes)
 {
@@ -452,17 +452,17 @@ BluetoothDaemonCoreModule::DutModeSendCm
                         *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 nsresult
 BluetoothDaemonCoreModule::LeTestModeCmd(uint16_t aOpcode,
                                          uint8_t* aBuf, uint8_t aLen,
                                          BluetoothResultHandler* aRes)
 {
@@ -476,17 +476,17 @@ BluetoothDaemonCoreModule::LeTestModeCmd
                         *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return rv;
 }
 
 // Responses
 //
 
 void
 BluetoothDaemonCoreModule::ErrorRsp(const DaemonSocketPDUHeader& aHeader,

--- a/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.cpp
@@ -62,17 +62,17 @@ BluetoothDaemonGattModule::ClientRegiste
 
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientUnregisterCmd(
   int aClientIf, BluetoothGattResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -84,17 +84,17 @@ BluetoothDaemonGattModule::ClientUnregis
   nsresult rv = PackPDU(aClientIf, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientScanCmd(
   int aClientIf, bool aStart, BluetoothGattResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -108,17 +108,17 @@ BluetoothDaemonGattModule::ClientScanCmd
                         PackConversion<bool, uint8_t>(aStart), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientConnectCmd(
   int aClientIf, const BluetoothAddress& aBdAddr, bool aIsDirect,
   BluetoothTransport aTransport, BluetoothGattResultHandler* aRes)
 {
@@ -138,17 +138,17 @@ BluetoothDaemonGattModule::ClientConnect
     PackConversion<BluetoothTransport, int32_t>(aTransport), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientDisconnectCmd(
   int aClientIf, const BluetoothAddress& aBdAddr, int aConnId,
   BluetoothGattResultHandler* aRes)
 {
@@ -166,17 +166,17 @@ BluetoothDaemonGattModule::ClientDisconn
                PackConversion<int, int32_t>(aConnId), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientListenCmd(
   int aClientIf, bool aIsStart, BluetoothGattResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -191,17 +191,17 @@ BluetoothDaemonGattModule::ClientListenC
                PackConversion<bool, uint8_t>(aIsStart), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientRefreshCmd(
   int aClientIf, const BluetoothAddress& aBdAddr,
   BluetoothGattResultHandler* aRes)
 {
@@ -217,17 +217,17 @@ BluetoothDaemonGattModule::ClientRefresh
                         *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientSearchServiceCmd(
   int aConnId, bool aFiltered, const BluetoothUuid& aUuid,
   BluetoothGattResultHandler* aRes)
 {
@@ -245,17 +245,17 @@ BluetoothDaemonGattModule::ClientSearchS
                         *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientGetIncludedServiceCmd(
   int aConnId, const BluetoothGattServiceId& aServiceId, bool aContinuation,
   const BluetoothGattServiceId& aStartServiceId,
   BluetoothGattResultHandler* aRes)
@@ -274,17 +274,17 @@ BluetoothDaemonGattModule::ClientGetIncl
                         aStartServiceId, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientGetCharacteristicCmd(
   int aConnId, const BluetoothGattServiceId& aServiceId, bool aContinuation,
   const BluetoothGattId& aStartCharId,
   BluetoothGattResultHandler* aRes)
@@ -304,17 +304,17 @@ BluetoothDaemonGattModule::ClientGetChar
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientGetDescriptorCmd(
   int aConnId, const BluetoothGattServiceId& aServiceId,
   const BluetoothGattId& aCharId, bool aContinuation,
   const BluetoothGattId& aStartDescriptorId,
@@ -336,17 +336,17 @@ BluetoothDaemonGattModule::ClientGetDesc
                         aStartDescriptorId, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientReadCharacteristicCmd(
   int aConnId, const BluetoothGattServiceId& aServiceId,
   const BluetoothGattId& aCharId, BluetoothGattAuthReq aAuthReq,
   BluetoothGattResultHandler* aRes)
@@ -364,17 +364,17 @@ BluetoothDaemonGattModule::ClientReadCha
                         aCharId, aAuthReq, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientWriteCharacteristicCmd(
   int aConnId, const BluetoothGattServiceId& aServiceId,
   const BluetoothGattId& aCharId, BluetoothGattWriteType aWriteType,
   int aLength, BluetoothGattAuthReq aAuthReq, char* aValue,
@@ -391,17 +391,17 @@ BluetoothDaemonGattModule::ClientWriteCh
                         PackArray<char>(aValue, aLength), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientReadDescriptorCmd(
   int aConnId, const BluetoothGattServiceId& aServiceId,
   const BluetoothGattId& aCharId, const BluetoothGattId& aDescriptorId,
   BluetoothGattAuthReq aAuthReq, BluetoothGattResultHandler* aRes)
@@ -420,17 +420,17 @@ BluetoothDaemonGattModule::ClientReadDes
                         aCharId, aDescriptorId, aAuthReq, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientWriteDescriptorCmd(
   int aConnId, const BluetoothGattServiceId& aServiceId,
   const BluetoothGattId& aCharId, const BluetoothGattId& aDescriptorId,
   BluetoothGattWriteType aWriteType, int aLength,
@@ -448,17 +448,17 @@ BluetoothDaemonGattModule::ClientWriteDe
                         PackArray<char>(aValue, aLength), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientExecuteWriteCmd(
   int aConnId, int aIsExecute, BluetoothGattResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -472,17 +472,17 @@ BluetoothDaemonGattModule::ClientExecute
                         PackConversion<int, int32_t>(aIsExecute), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientRegisterNotificationCmd(
   int aClientIf, const BluetoothAddress& aBdAddr,
   const BluetoothGattServiceId& aServiceId, const BluetoothGattId& aCharId,
   BluetoothGattResultHandler* aRes)
@@ -500,17 +500,17 @@ BluetoothDaemonGattModule::ClientRegiste
                         aBdAddr, aServiceId, aCharId, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientDeregisterNotificationCmd(
   int aClientIf, const BluetoothAddress& aBdAddr,
   const BluetoothGattServiceId& aServiceId, const BluetoothGattId& aCharId,
   BluetoothGattResultHandler* aRes)
@@ -528,17 +528,17 @@ BluetoothDaemonGattModule::ClientDeregis
                         aBdAddr, aServiceId, aCharId, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientReadRemoteRssiCmd(
   int aClientIf, const BluetoothAddress& aBdAddr,
   BluetoothGattResultHandler* aRes)
 {
@@ -553,17 +553,17 @@ BluetoothDaemonGattModule::ClientReadRem
                         aBdAddr, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientGetDeviceTypeCmd(
   const BluetoothAddress& aBdAddr, BluetoothGattResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -575,17 +575,17 @@ BluetoothDaemonGattModule::ClientGetDevi
   nsresult rv = PackPDU(aBdAddr, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientSetAdvDataCmd(
   int aServerIf, bool aIsScanRsp, bool aIsNameIncluded,
   bool aIsTxPowerIncluded, int aMinInterval, int aMaxInterval, int aApperance,
   uint16_t aManufacturerLen, char* aManufacturerData,
@@ -611,17 +611,17 @@ BluetoothDaemonGattModule::ClientSetAdvD
     aServiceUuidLen, PackArray<char>(aServiceUuid, aServiceUuidLen), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ClientTestCommandCmd(
   int aCommand, const BluetoothGattTestParam& aTestParam,
   BluetoothGattResultHandler* aRes)
 {
@@ -645,17 +645,17 @@ BluetoothDaemonGattModule::ClientTestCom
     aTestParam.mU5, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerRegisterCmd(
   const BluetoothUuid& aUuid, BluetoothGattResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -667,17 +667,17 @@ BluetoothDaemonGattModule::ServerRegiste
   nsresult rv = PackPDU(aUuid, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerUnregisterCmd(
   int aServerIf, BluetoothGattResultHandler* aRes)
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -689,17 +689,17 @@ BluetoothDaemonGattModule::ServerUnregis
   nsresult rv = PackPDU(PackConversion<int, int32_t>(aServerIf), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerConnectPeripheralCmd(
   int aServerIf, const BluetoothAddress& aBdAddr, bool aIsDirect,
   BluetoothTransport aTransport, BluetoothGattResultHandler* aRes)
 {
@@ -719,17 +719,17 @@ BluetoothDaemonGattModule::ServerConnect
     PackConversion<BluetoothTransport, int32_t>(aTransport), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerDisconnectPeripheralCmd(
   int aServerIf, const BluetoothAddress& aBdAddr, int aConnId,
   BluetoothGattResultHandler* aRes)
 {
@@ -746,17 +746,17 @@ BluetoothDaemonGattModule::ServerDisconn
                         PackConversion<int, int32_t>(aConnId), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerAddServiceCmd(
   int aServerIf, const BluetoothGattServiceId& aServiceId, uint16_t aNumHandles,
   BluetoothGattResultHandler* aRes)
 {
@@ -772,17 +772,17 @@ BluetoothDaemonGattModule::ServerAddServ
                         PackConversion<uint16_t, int32_t>(aNumHandles), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerAddIncludedServiceCmd(
   int aServerIf, const BluetoothAttributeHandle& aServiceHandle,
   const BluetoothAttributeHandle& aIncludedServiceHandle,
   BluetoothGattResultHandler* aRes)
@@ -799,17 +799,17 @@ BluetoothDaemonGattModule::ServerAddIncl
                         aServiceHandle, aIncludedServiceHandle, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerAddCharacteristicCmd(
   int aServerIf, const BluetoothAttributeHandle& aServiceHandle,
   const BluetoothUuid& aUuid, BluetoothGattCharProp aProperties,
   BluetoothGattAttrPerm aPermissions, BluetoothGattResultHandler* aRes)
@@ -830,17 +830,17 @@ BluetoothDaemonGattModule::ServerAddChar
     PackConversion<BluetoothGattAttrPerm, int32_t>(aPermissions), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerAddDescriptorCmd(
   int aServerIf, const BluetoothAttributeHandle& aServiceHandle,
   const BluetoothUuid& aUuid, BluetoothGattAttrPerm aPermissions,
   BluetoothGattResultHandler* aRes)
@@ -859,17 +859,17 @@ BluetoothDaemonGattModule::ServerAddDesc
     PackConversion<BluetoothGattAttrPerm, int32_t>(aPermissions), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerStartServiceCmd(
   int aServerIf, const BluetoothAttributeHandle& aServiceHandle,
   BluetoothTransport aTransport, BluetoothGattResultHandler* aRes)
 {
@@ -886,17 +886,17 @@ BluetoothDaemonGattModule::ServerStartSe
     PackConversion<BluetoothTransport, int32_t>(aTransport), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerStopServiceCmd(
   int aServerIf, const BluetoothAttributeHandle& aServiceHandle,
   BluetoothGattResultHandler* aRes)
 {
@@ -911,17 +911,17 @@ BluetoothDaemonGattModule::ServerStopSer
     PackConversion<int, int32_t>(aServerIf), aServiceHandle, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerDeleteServiceCmd(
   int aServerIf, const BluetoothAttributeHandle& aServiceHandle,
   BluetoothGattResultHandler* aRes)
 {
@@ -936,17 +936,17 @@ BluetoothDaemonGattModule::ServerDeleteS
     PackConversion<int, int32_t>(aServerIf), aServiceHandle, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerSendIndicationCmd(
   int aServerIf, const BluetoothAttributeHandle& aCharacteristicHandle,
   int aConnId, int aLength, bool aConfirm,
   uint8_t* aValue, BluetoothGattResultHandler* aRes)
@@ -965,17 +965,17 @@ BluetoothDaemonGattModule::ServerSendInd
                         PackArray<uint8_t>(aValue, aLength), *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 nsresult
 BluetoothDaemonGattModule::ServerSendResponseCmd(
   int aConnId, int aTransId, uint16_t aStatus,
   const BluetoothGattResponse& aResponse,
   BluetoothGattResultHandler* aRes)
@@ -998,17 +998,17 @@ BluetoothDaemonGattModule::ServerSendRes
 
   if (NS_FAILED(rv)) {
     return rv;
   }
   rv = Send(pdu, aRes);
   if (NS_FAILED(rv)) {
     return rv;
   }
-  unused << pdu.forget();
+  Unused << pdu.forget();
   return NS_OK;
 }
 
 // Responses
 //
 
 void
 BluetoothDaemonGattModule::ErrorRsp(