Bug 1129795 - Convert docshell/base/ to Gecko style. r=mccr8,smaug

2015-02-13 21:36:37 +02:00
parent 25b867caa0
commit 9a04e80e2c
31 changed files with 12267 additions and 12168 deletions
--- a/docshell/base/IHistory.h
+++ b/docshell/base/IHistory.h
@@ -65,7 +65,8 @@ public:
   */
  NS_IMETHOD UnregisterVisitedCallback(nsIURI* aURI, dom::Link* aLink) = 0;
-    enum VisitFlags {
+  enum VisitFlags
  {
    /**
     * Indicates whether the URI was loaded in a top-level window.
     */
@@ -101,11 +102,9 @@ public:
   * @param aFlags
   *        The VisitFlags describing this visit.
   */
-    NS_IMETHOD VisitURI(
+  NS_IMETHOD VisitURI(nsIURI* aURI,
        nsIURI *aURI,
                      nsIURI* aLastVisitedURI,
-        uint32_t aFlags
+                      uint32_t aFlags) = 0;
    ) = 0;
  /**
   * Set the title of the URI.
--- a/docshell/base/LoadContext.h
+++ b/docshell/base/LoadContext.h
@@ -31,8 +31,9 @@ namespace mozilla {
 * to separate the safebrowsing cookie.
 */
-class LoadContext MOZ_FINAL : public nsILoadContext,
+class LoadContext MOZ_FINAL
-                              public nsIInterfaceRequestor
+  : public nsILoadContext
  , public nsIInterfaceRequestor
 {
 public:
  NS_DECL_ISUPPORTS
--- a/docshell/base/LoadInfo.cpp
+++ b/docshell/base/LoadInfo.cpp
@@ -93,12 +93,12 @@ LoadInfo::TriggeringPrincipal()
 }
 NS_IMETHODIMP
-LoadInfo::GetLoadingDocument(nsIDOMDocument** outLoadingDocument)
+LoadInfo::GetLoadingDocument(nsIDOMDocument** aResult)
 {
  nsCOMPtr<nsINode> node = do_QueryReferent(mLoadingContext);
  if (node) {
    nsCOMPtr<nsIDOMDocument> context = do_QueryInterface(node->OwnerDoc());
-    context.forget(outLoadingDocument);
+    context.forget(aResult);
  }
  return NS_OK;
 }
@@ -111,16 +111,17 @@ LoadInfo::LoadingNode()
 }
 NS_IMETHODIMP
-LoadInfo::GetSecurityFlags(nsSecurityFlags* outSecurityFlags)
+LoadInfo::GetSecurityFlags(nsSecurityFlags* aResult)
 {
-  *outSecurityFlags = mSecurityFlags;
+  *aResult = mSecurityFlags;
  return NS_OK;
 }
 NS_IMETHODIMP
 LoadInfo::GetForceInheritPrincipal(bool* aInheritPrincipal)
 {
-  *aInheritPrincipal = (mSecurityFlags & nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL);
+  *aInheritPrincipal =
    (mSecurityFlags & nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL);
  return NS_OK;
 }
@@ -132,9 +133,9 @@ LoadInfo::GetLoadingSandboxed(bool* aLoadingSandboxed)
 }
 NS_IMETHODIMP
-LoadInfo::GetContentPolicyType(nsContentPolicyType* outContentPolicyType)
+LoadInfo::GetContentPolicyType(nsContentPolicyType* aResult)
 {
-  *outContentPolicyType = mContentPolicyType;
+  *aResult = mContentPolicyType;
  return NS_OK;
 }
@@ -153,9 +154,9 @@ LoadInfo::BaseURI()
 }
 NS_IMETHODIMP
-LoadInfo::GetInnerWindowID(uint32_t* outInnerWindowID)
+LoadInfo::GetInnerWindowID(uint32_t* aResult)
 {
-  *outInnerWindowID = mInnerWindowID;
+  *aResult = mInnerWindowID;
  return NS_OK;
 }
--- a/docshell/base/SerializedLoadContext.cpp
+++ b/docshell/base/SerializedLoadContext.cpp
@@ -34,7 +34,8 @@ SerializedLoadContext::SerializedLoadContext(nsIChannel* aChannel)
    bool isOverriden = false;
    nsCOMPtr<nsIPrivateBrowsingChannel> pbChannel = do_QueryInterface(aChannel);
    if (pbChannel &&
-        NS_SUCCEEDED(pbChannel->IsPrivateModeOverriden(&isPrivate, &isOverriden)) &&
+        NS_SUCCEEDED(pbChannel->IsPrivateModeOverriden(&isPrivate,
                                                       &isOverriden)) &&
        isOverriden) {
      mUsePrivateBrowsing = isPrivate;
      mIsPrivateBitValid = true;
--- a/docshell/base/SerializedLoadContext.h
+++ b/docshell/base/SerializedLoadContext.h
@@ -37,15 +37,8 @@ public:
  void Init(nsILoadContext* aLoadContext);
-  bool IsNotNull() const
+  bool IsNotNull() const { return mIsNotNull; }
-  {
+  bool IsPrivateBitValid() const { return mIsPrivateBitValid; }
    return mIsNotNull;
  }
  bool IsPrivateBitValid() const
  {
    return mIsPrivateBitValid;
  }
  // used to indicate if child-side LoadContext * was null.
  bool mIsNotNull;
--- a/docshell/base/TimelineMarker.h
+++ b/docshell/base/TimelineMarker.h
@@ -34,9 +34,9 @@ public:
  // Check whether two markers should be considered the same,
  // for the purpose of pairing start and end markers.  Normally
  // this definition suffices.
-  virtual bool Equals(const TimelineMarker* other)
+  virtual bool Equals(const TimelineMarker* aOther)
  {
-    return strcmp(mName, other->mName) == 0;
+    return strcmp(mName, aOther->mName) == 0;
  }
  // Add details specific to this marker type to aMarker.  The
@@ -44,34 +44,18 @@ public:
  // called on both the starting and ending markers of a pair.
  // Ordinarily the ending marker doesn't need to do anything
  // here.
-  virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker)
+  virtual void AddDetails(mozilla::dom::ProfileTimelineMarker& aMarker) {}
  {
  }
-  virtual void AddLayerRectangles(mozilla::dom::Sequence<mozilla::dom::ProfileTimelineLayerRect>&)
+  virtual void AddLayerRectangles(
      mozilla::dom::Sequence<mozilla::dom::ProfileTimelineLayerRect>&)
  {
    MOZ_ASSERT_UNREACHABLE("can only be called on layer markers");
  }
-  const char* GetName() const
+  const char* GetName() const { return mName; }
-  {
+  TracingMetadata GetMetaData() const { return mMetaData; }
-    return mName;
+  DOMHighResTimeStamp GetTime() const { return mTime; }
-  }
+  const nsString& GetCause() const { return mCause; }
  TracingMetadata GetMetaData() const
  {
    return mMetaData;
  }
  DOMHighResTimeStamp GetTime() const
  {
    return mTime;
  }
  const nsString& GetCause() const
  {
    return mCause;
  }
  JSObject* GetStack()
  {
@@ -82,7 +66,6 @@ public:
  }
 protected:
  void CaptureStack()
  {
    JSContext* ctx = nsContentUtils::GetCurrentJSContext();
@@ -97,7 +80,6 @@ protected:
  }
 private:
  const char* mName;
  TracingMetadata mMetaData;
  DOMHighResTimeStamp mTime;
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
@@ -12,7 +12,8 @@
 NS_IMPL_ISUPPORTS(nsAboutRedirector, nsIAboutModule)
-struct RedirEntry {
+struct RedirEntry
 {
  const char* id;
  const char* url;
  uint32_t flags;
@@ -29,61 +30,93 @@ struct RedirEntry {
  URI.  Perhaps we should separate the two concepts out...
 */
 static RedirEntry kRedirMap[] = {
-    { "", "chrome://global/content/about.xhtml",
+  {
-      nsIAboutModule::ALLOW_SCRIPT },
+    "", "chrome://global/content/about.xhtml",
    nsIAboutModule::ALLOW_SCRIPT
  },
  { "about", "chrome://global/content/aboutAbout.xhtml", 0 },
-    { "credits", "http://www.mozilla.org/credits/",
+  {
-      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
+    "credits", "http://www.mozilla.org/credits/",
-    { "mozilla", "chrome://global/content/mozilla.xhtml",
+    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
-      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
+  },
  {
    "mozilla", "chrome://global/content/mozilla.xhtml",
    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
  },
  { "plugins", "chrome://global/content/plugins.html", 0 },
  { "config", "chrome://global/content/config.xul", 0 },
 #ifdef MOZ_CRASHREPORTER
  { "crashes", "chrome://global/content/crashes.xhtml", 0 },
 #endif
-    { "logo", "chrome://branding/content/about.png",
+  {
-      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
+    "logo", "chrome://branding/content/about.png",
-    { "buildconfig", "chrome://global/content/buildconfig.html",
+    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
-      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
+  },
-    { "license", "chrome://global/content/license.html",
+  {
-      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT },
+    "buildconfig", "chrome://global/content/buildconfig.html",
-    { "neterror", "chrome://global/content/netError.xhtml",
+    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
  },
  {
    "license", "chrome://global/content/license.html",
    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
  },
  {
    "neterror", "chrome://global/content/netError.xhtml",
    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
      nsIAboutModule::URI_CAN_LOAD_IN_CHILD |
      nsIAboutModule::ALLOW_SCRIPT |
-      nsIAboutModule::HIDE_FROM_ABOUTABOUT },
+      nsIAboutModule::HIDE_FROM_ABOUTABOUT
-    { "memory", "chrome://global/content/aboutMemory.xhtml",
+  },
-      nsIAboutModule::ALLOW_SCRIPT },
+  {
-    { "compartments", "chrome://global/content/aboutCompartments.xhtml",
+    "memory", "chrome://global/content/aboutMemory.xhtml",
-      nsIAboutModule::ALLOW_SCRIPT },
+    nsIAboutModule::ALLOW_SCRIPT
-    { "addons", "chrome://mozapps/content/extensions/extensions.xul",
+  },
-      nsIAboutModule::ALLOW_SCRIPT },
+  {
-    { "newaddon", "chrome://mozapps/content/extensions/newaddon.xul",
+    "compartments", "chrome://global/content/aboutCompartments.xhtml",
    nsIAboutModule::ALLOW_SCRIPT
  },
  {
    "addons", "chrome://mozapps/content/extensions/extensions.xul",
    nsIAboutModule::ALLOW_SCRIPT
  },
  {
    "newaddon", "chrome://mozapps/content/extensions/newaddon.xul",
    nsIAboutModule::ALLOW_SCRIPT |
-      nsIAboutModule::HIDE_FROM_ABOUTABOUT },
+      nsIAboutModule::HIDE_FROM_ABOUTABOUT
-    { "support", "chrome://global/content/aboutSupport.xhtml",
+  },
-      nsIAboutModule::ALLOW_SCRIPT },
+  {
-    { "telemetry", "chrome://global/content/aboutTelemetry.xhtml",
+    "support", "chrome://global/content/aboutSupport.xhtml",
-      nsIAboutModule::ALLOW_SCRIPT },
+    nsIAboutModule::ALLOW_SCRIPT
-    { "networking", "chrome://global/content/aboutNetworking.xhtml",
+  },
-       nsIAboutModule::ALLOW_SCRIPT },
+  {
-    { "webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.xhtml",
+    "telemetry", "chrome://global/content/aboutTelemetry.xhtml",
-       nsIAboutModule::ALLOW_SCRIPT },
+    nsIAboutModule::ALLOW_SCRIPT
  },
  {
    "networking", "chrome://global/content/aboutNetworking.xhtml",
    nsIAboutModule::ALLOW_SCRIPT
  },
  {
    "webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.xhtml",
    nsIAboutModule::ALLOW_SCRIPT
  },
  // about:srcdoc is unresolvable by specification.  It is included here
  // because the security manager would disallow srcdoc iframes otherwise.
-    { "srcdoc", "about:blank",
+  {
    "srcdoc", "about:blank",
    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
-      nsIAboutModule::HIDE_FROM_ABOUTABOUT }
+      nsIAboutModule::HIDE_FROM_ABOUTABOUT
  }
 };
 static const int kRedirTotal = mozilla::ArrayLength(kRedirMap);
 NS_IMETHODIMP
 nsAboutRedirector::NewChannel(nsIURI* aURI,
                              nsILoadInfo* aLoadInfo,
-                              nsIChannel** result)
+                              nsIChannel** aResult)
 {
  NS_ENSURE_ARG_POINTER(aURI);
-    NS_ASSERTION(result, "must not be null");
+  NS_ASSERTION(aResult, "must not be null");
  nsAutoCString path;
  nsresult rv = NS_GetAboutModuleName(aURI, path);
@@ -92,11 +125,8 @@ nsAboutRedirector::NewChannel(nsIURI* aURI,
  nsCOMPtr<nsIIOService> ioService = do_GetIOService(&rv);
  NS_ENSURE_SUCCESS(rv, rv);
-
+  for (int i = 0; i < kRedirTotal; i++) {
-    for (int i=0; i<kRedirTotal; i++) 
+    if (!strcmp(path.get(), kRedirMap[i].id)) {
    {
        if (!strcmp(path.get(), kRedirMap[i].id))
        {
      nsCOMPtr<nsIChannel> tempChannel;
      nsCOMPtr<nsIURI> tempURI;
      rv = NS_NewURI(getter_AddRefs(tempURI), kRedirMap[i].url);
@@ -109,17 +139,16 @@ nsAboutRedirector::NewChannel(nsIURI* aURI,
        rv = NS_NewChannelInternal(getter_AddRefs(tempChannel),
                                   tempURI,
                                   aLoadInfo);
      } else {
        rv = ioService->NewChannelFromURI(tempURI, getter_AddRefs(tempChannel));
      }
-            else {
+      if (NS_FAILED(rv)) {
              rv = ioService->NewChannelFromURI(tempURI,
                                                getter_AddRefs(tempChannel));
            }
            if (NS_FAILED(rv))
        return rv;
      }
      tempChannel->SetOriginalURI(aURI);
-            NS_ADDREF(*result = tempChannel);
+      NS_ADDREF(*aResult = tempChannel);
      return rv;
    }
  }
@@ -129,7 +158,7 @@ nsAboutRedirector::NewChannel(nsIURI* aURI,
 }
 NS_IMETHODIMP
-nsAboutRedirector::GetURIFlags(nsIURI *aURI, uint32_t *result)
+nsAboutRedirector::GetURIFlags(nsIURI* aURI, uint32_t* aResult)
 {
  NS_ENSURE_ARG_POINTER(aURI);
@@ -137,11 +166,9 @@ nsAboutRedirector::GetURIFlags(nsIURI *aURI, uint32_t *result)
  nsresult rv = NS_GetAboutModuleName(aURI, name);
  NS_ENSURE_SUCCESS(rv, rv);
-    for (int i=0; i < kRedirTotal; i++) 
+  for (int i = 0; i < kRedirTotal; i++) {
-    {
+    if (name.EqualsASCII(kRedirMap[i].id)) {
-        if (name.EqualsASCII(kRedirMap[i].id))
+      *aResult = kRedirMap[i].flags;
        {
            *result = kRedirMap[i].flags;
      return NS_OK;
    }
  }
@@ -151,9 +178,9 @@ nsAboutRedirector::GetURIFlags(nsIURI *aURI, uint32_t *result)
 }
 NS_IMETHODIMP
-nsAboutRedirector::GetIndexedDBOriginPostfix(nsIURI *aURI, nsAString &result)
+nsAboutRedirector::GetIndexedDBOriginPostfix(nsIURI* aURI, nsAString& aResult)
 {
-    SetDOMStringToNull(result);
+  SetDOMStringToNull(aResult);
  return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -161,8 +188,9 @@ nsresult
 nsAboutRedirector::Create(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
  nsAboutRedirector* about = new nsAboutRedirector();
-    if (about == nullptr)
+  if (!about) {
    return NS_ERROR_OUT_OF_MEMORY;
  }
  NS_ADDREF(about);
  nsresult rv = about->QueryInterface(aIID, aResult);
  NS_RELEASE(about);
--- a/docshell/base/nsAboutRedirector.h
+++ b/docshell/base/nsAboutRedirector.h
@@ -17,8 +17,7 @@ public:
  nsAboutRedirector() {}
-    static nsresult
+  static nsresult Create(nsISupports* aOuter, REFNSIID aIID, void** aResult);
    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 protected:
  virtual ~nsAboutRedirector() {}
--- a/docshell/base/nsDSURIContentListener.cpp
+++ b/docshell/base/nsDSURIContentListener.cpp
@@ -48,7 +48,6 @@ nsDSURIContentListener::Init()
  return rv;
 }
 //*****************************************************************************
 // nsDSURIContentListener::nsISupports
 //*****************************************************************************
@@ -79,8 +78,9 @@ nsDSURIContentListener::OnStartURIOpen(nsIURI* aURI, bool* aAbortOpen)
  nsCOMPtr<nsIURIContentListener> parentListener;
  GetParentContentListener(getter_AddRefs(parentListener));
-    if (parentListener)
+  if (parentListener) {
    return parentListener->OnStartURIOpen(aURI, aAbortOpen);
  }
  return NS_OK;
 }
@@ -88,7 +88,7 @@ nsDSURIContentListener::OnStartURIOpen(nsIURI* aURI, bool* aAbortOpen)
 NS_IMETHODIMP
 nsDSURIContentListener::DoContent(const char* aContentType,
                                  bool aIsContentPreferred,
-                                  nsIRequest* request,
+                                  nsIRequest* aRequest,
                                  nsIStreamListener** aContentHandler,
                                  bool* aAbortProcess)
 {
@@ -99,7 +99,7 @@ nsDSURIContentListener::DoContent(const char* aContentType,
  // Check whether X-Frame-Options permits us to load this content in an
  // iframe and abort the load (unless we've disabled x-frame-options
  // checking).
-    if (!CheckFrameOptions(request)) {
+  if (!CheckFrameOptions(aRequest)) {
    *aAbortProcess = true;
    return NS_OK;
  }
@@ -108,13 +108,13 @@ nsDSURIContentListener::DoContent(const char* aContentType,
  // determine if the channel has just been retargeted to us...
  nsLoadFlags loadFlags = 0;
-    nsCOMPtr<nsIChannel> aOpenedChannel = do_QueryInterface(request);
+  nsCOMPtr<nsIChannel> aOpenedChannel = do_QueryInterface(aRequest);
-    if (aOpenedChannel)
+  if (aOpenedChannel) {
    aOpenedChannel->GetLoadFlags(&loadFlags);
  }
-    if(loadFlags & nsIChannel::LOAD_RETARGETED_DOCUMENT_URI)
+  if (loadFlags & nsIChannel::LOAD_RETARGETED_DOCUMENT_URI) {
    {
    // XXX: Why does this not stop the content too?
    mDocShell->Stop(nsIWebNavigation::STOP_NETWORK);
@@ -125,20 +125,19 @@ nsDSURIContentListener::DoContent(const char* aContentType,
  // create new viewer since the one we already have is capable of
  // rendering multipart jpeg correctly (see bug 625012)
  nsCOMPtr<nsIChannel> baseChannel;
-    if (nsCOMPtr<nsIMultiPartChannel> mpchan = do_QueryInterface(request)) {
+  if (nsCOMPtr<nsIMultiPartChannel> mpchan = do_QueryInterface(aRequest)) {
    mpchan->GetBaseChannel(getter_AddRefs(baseChannel));
  }
-    bool reuseCV = baseChannel
+  bool reuseCV = baseChannel && baseChannel == mExistingJPEGRequest &&
-        && baseChannel == mExistingJPEGRequest
+                 nsDependentCString(aContentType).EqualsLiteral("image/jpeg");
        && nsDependentCString(aContentType).EqualsLiteral("image/jpeg");
  if (mExistingJPEGStreamListener && reuseCV) {
    nsRefPtr<nsIStreamListener> copy(mExistingJPEGStreamListener);
    copy.forget(aContentHandler);
    rv = NS_OK;
  } else {
-        rv = mDocShell->CreateContentViewer(aContentType, request, aContentHandler);
+    rv = mDocShell->CreateContentViewer(aContentType, aRequest, aContentHandler);
    if (NS_SUCCEEDED(rv) && reuseCV) {
      mExistingJPEGStreamListener = *aContentHandler;
    } else {
@@ -147,9 +146,8 @@ nsDSURIContentListener::DoContent(const char* aContentType,
    mExistingJPEGRequest = baseChannel;
  }
  if (rv == NS_ERROR_REMOTE_XUL) {
-      request->Cancel(rv);
+    aRequest->Cancel(rv);
    *aAbortProcess = true;
    return NS_OK;
  }
@@ -161,8 +159,8 @@ nsDSURIContentListener::DoContent(const char* aContentType,
  }
  if (loadFlags & nsIChannel::LOAD_RETARGETED_DOCUMENT_URI) {
-        nsCOMPtr<nsIDOMWindow> domWindow = mDocShell ? mDocShell->GetWindow()
+    nsCOMPtr<nsIDOMWindow> domWindow =
-          : nullptr;
+      mDocShell ? mDocShell->GetWindow() : nullptr;
    NS_ENSURE_TRUE(domWindow, NS_ERROR_FAILURE);
    domWindow->Focus();
  }
@@ -199,10 +197,7 @@ nsDSURIContentListener::IsPreferred(const char* aContentType,
  // and someone didn't EXPLICITLY set a nsIURIContentListener at the top
  // of our docshell chain, then we'll now always attempt to process the
  // content ourselves...
-    return CanHandleContent(aContentType,
+  return CanHandleContent(aContentType, true, aDesiredContentType, aCanHandle);
                            true,
                            aDesiredContentType,
                            aCanHandle);
 }
 NS_IMETHODIMP
@@ -249,17 +244,15 @@ nsDSURIContentListener::SetLoadCookie(nsISupports * aLoadCookie)
 }
 NS_IMETHODIMP
-nsDSURIContentListener::GetParentContentListener(nsIURIContentListener**
+nsDSURIContentListener::GetParentContentListener(
-                                                 aParentListener)
+    nsIURIContentListener** aParentListener)
 {
    if (mWeakParentContentListener)
 {
  if (mWeakParentContentListener) {
    nsCOMPtr<nsIURIContentListener> tempListener =
      do_QueryReferent(mWeakParentContentListener);
    *aParentListener = tempListener;
    NS_IF_ADDREF(*aParentListener);
-    }
+  } else {
    else {
    *aParentListener = mParentContentListener;
    NS_IF_ADDREF(*aParentListener);
  }
@@ -267,43 +260,42 @@ nsDSURIContentListener::GetParentContentListener(nsIURIContentListener**
 }
 NS_IMETHODIMP
-nsDSURIContentListener::SetParentContentListener(nsIURIContentListener* 
+nsDSURIContentListener::SetParentContentListener(
-                                                 aParentListener)
+    nsIURIContentListener* aParentListener)
 {
    if (aParentListener)
 {
  if (aParentListener) {
    // Store the parent listener as a weak ref. Parents not supporting
    // nsISupportsWeakReference assert but may still be used.
    mParentContentListener = nullptr;
    mWeakParentContentListener = do_GetWeakReference(aParentListener);
-        if (!mWeakParentContentListener)
+    if (!mWeakParentContentListener) {
        {
      mParentContentListener = aParentListener;
    }
-    }
+  } else {
    else
    {
    mWeakParentContentListener = nullptr;
    mParentContentListener = nullptr;
  }
  return NS_OK;
 }
-bool nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel *httpChannel,
+bool
-                                                        const nsAString& policy) {
+nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel* aHttpChannel,
                                                   const nsAString& aPolicy)
 {
  static const char allowFrom[] = "allow-from";
  const uint32_t allowFromLen = ArrayLength(allowFrom) - 1;
  bool isAllowFrom =
-        StringHead(policy, allowFromLen).LowerCaseEqualsLiteral(allowFrom);
+    StringHead(aPolicy, allowFromLen).LowerCaseEqualsLiteral(allowFrom);
  // return early if header does not have one of the values with meaning
-    if (!policy.LowerCaseEqualsLiteral("deny") &&
+  if (!aPolicy.LowerCaseEqualsLiteral("deny") &&
-        !policy.LowerCaseEqualsLiteral("sameorigin") &&
+      !aPolicy.LowerCaseEqualsLiteral("sameorigin") &&
-        !isAllowFrom)
+      !isAllowFrom) {
    return true;
  }
  nsCOMPtr<nsIURI> uri;
-    httpChannel->GetURI(getter_AddRefs(uri));
+  aHttpChannel->GetURI(getter_AddRefs(uri));
  // XXXkhuey when does this happen?  Is returning true safe here?
  if (!mDocShell) {
@@ -316,8 +308,9 @@ bool nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel *httpChan
  // the document must never be framed.
  nsCOMPtr<nsIDOMWindow> thisWindow = mDocShell->GetWindow();
  // If we don't have DOMWindow there is no risk of clickjacking
-    if (!thisWindow)
+  if (!thisWindow) {
    return true;
  }
  // GetScriptableTop, not GetTop, because we want this to respect
  // <iframe mozbrowser> boundaries.
@@ -325,17 +318,18 @@ bool nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel *httpChan
  thisWindow->GetScriptableTop(getter_AddRefs(topWindow));
  // if the document is in the top window, it's not in a frame.
-    if (thisWindow == topWindow)
+  if (thisWindow == topWindow) {
    return true;
  }
  // Find the top docshell in our parent chain that doesn't have the system
  // principal and use it for the principal comparison.  Finding the top
  // content-type docshell doesn't work because some chrome documents are
  // loaded in content docshells (see bug 593387).
-    nsCOMPtr<nsIDocShellTreeItem> thisDocShellItem(do_QueryInterface(
+  nsCOMPtr<nsIDocShellTreeItem> thisDocShellItem(
-                                                   static_cast<nsIDocShell*> (mDocShell)));
+    do_QueryInterface(static_cast<nsIDocShell*>(mDocShell)));
-    nsCOMPtr<nsIDocShellTreeItem> parentDocShellItem,
+  nsCOMPtr<nsIDocShellTreeItem> parentDocShellItem;
-                                  curDocShellItem = thisDocShellItem;
+  nsCOMPtr<nsIDocShellTreeItem> curDocShellItem = thisDocShellItem;
  nsCOMPtr<nsIDocument> topDoc;
  nsresult rv;
  nsCOMPtr<nsIScriptSecurityManager> ssm =
@@ -347,9 +341,9 @@ bool nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel *httpChan
  // Traverse up the parent chain and stop when we see a docshell whose
  // parent has a system principal, or a docshell corresponding to
  // <iframe mozbrowser>.
-    while (NS_SUCCEEDED(curDocShellItem->GetParent(getter_AddRefs(parentDocShellItem))) &&
+  while (NS_SUCCEEDED(
           curDocShellItem->GetParent(getter_AddRefs(parentDocShellItem))) &&
         parentDocShellItem) {
    nsCOMPtr<nsIDocShell> curDocShell = do_QueryInterface(curDocShellItem);
    if (curDocShell && curDocShell->GetIsBrowserOrApp()) {
      break;
@@ -358,13 +352,13 @@ bool nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel *httpChan
    bool system = false;
    topDoc = parentDocShellItem->GetDocument();
    if (topDoc) {
-            if (NS_SUCCEEDED(ssm->IsSystemPrincipal(topDoc->NodePrincipal(),
+      if (NS_SUCCEEDED(
-                                                    &system)) && system) {
+            ssm->IsSystemPrincipal(topDoc->NodePrincipal(), &system)) &&
          system) {
        // Found a system-principled doc: last docshell was top.
        break;
      }
-        }
+    } else {
        else {
      return false;
    }
    curDocShellItem = parentDocShellItem;
@@ -372,13 +366,14 @@ bool nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel *httpChan
  // If this document has the top non-SystemPrincipal docshell it is not being
  // framed or it is being framed by a chrome document, which we allow.
-    if (curDocShellItem == thisDocShellItem)
+  if (curDocShellItem == thisDocShellItem) {
    return true;
  }
  // If the value of the header is DENY, and the previous condition is
  // not met (current docshell is not the top docshell), prohibit the
  // load.
-    if (policy.LowerCaseEqualsLiteral("deny")) {
+  if (aPolicy.LowerCaseEqualsLiteral("deny")) {
    ReportXFOViolation(curDocShellItem, uri, eDENY);
    return false;
  }
@@ -389,7 +384,7 @@ bool nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel *httpChan
  // If the X-Frame-Options value is SAMEORIGIN, then the top frame in the
  // parent chain must be from the same origin as this document.
-    if (policy.LowerCaseEqualsLiteral("sameorigin")) {
+  if (aPolicy.LowerCaseEqualsLiteral("sameorigin")) {
    rv = ssm->CheckSameOriginURI(uri, topUri, true);
    if (NS_FAILED(rv)) {
      ReportXFOViolation(curDocShellItem, uri, eSAMEORIGIN);
@@ -400,16 +395,16 @@ bool nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel *httpChan
  // If the X-Frame-Options value is "allow-from [uri]", then the top
  // frame in the parent chain must be from that origin
  if (isAllowFrom) {
-        if (policy.Length() == allowFromLen ||
+    if (aPolicy.Length() == allowFromLen ||
-            (policy[allowFromLen] != ' ' &&
+        (aPolicy[allowFromLen] != ' ' &&
-             policy[allowFromLen] != '\t')) {
+         aPolicy[allowFromLen] != '\t')) {
      ReportXFOViolation(curDocShellItem, uri, eALLOWFROM);
      return false;
    }
-        rv = NS_NewURI(getter_AddRefs(uri),
+    rv = NS_NewURI(getter_AddRefs(uri), Substring(aPolicy, allowFromLen));
-                       Substring(policy, allowFromLen));
+    if (NS_FAILED(rv)) {
        if (NS_FAILED(rv))
      return false;
    }
    rv = ssm->CheckSameOriginURI(uri, topUri, true);
    if (NS_FAILED(rv)) {
@@ -424,10 +419,11 @@ bool nsDSURIContentListener::CheckOneFrameOptionsPolicy(nsIHttpChannel *httpChan
 // Check if X-Frame-Options permits this document to be loaded as a subdocument.
 // This will iterate through and check any number of X-Frame-Options policies
 // in the request (comma-separated in a header, multiple headers, etc).
-bool nsDSURIContentListener::CheckFrameOptions(nsIRequest *request)
+bool
 nsDSURIContentListener::CheckFrameOptions(nsIRequest* aRequest)
 {
  nsresult rv;
-    nsCOMPtr<nsIChannel> chan = do_QueryInterface(request);
+  nsCOMPtr<nsIChannel> chan = do_QueryInterface(aRequest);
  if (!chan) {
    return true;
  }
@@ -436,9 +432,10 @@ bool nsDSURIContentListener::CheckFrameOptions(nsIRequest *request)
  if (!httpChannel) {
    // check if it is hiding in a multipart channel
    rv = mDocShell->GetHttpChannel(chan, getter_AddRefs(httpChannel));
-      if (NS_FAILED(rv))
+    if (NS_FAILED(rv)) {
      return false;
    }
  }
  if (!httpChannel) {
    return true;
@@ -450,8 +447,9 @@ bool nsDSURIContentListener::CheckFrameOptions(nsIRequest *request)
  NS_ConvertUTF8toUTF16 xfoHeaderValue(xfoHeaderCValue);
  // if no header value, there's nothing to do.
-    if (xfoHeaderValue.IsEmpty())
+  if (xfoHeaderValue.IsEmpty()) {
    return true;
  }
  // iterate through all the header values (usually there's only one, but can
  // be many.  If any want to deny the load, deny the load.
@@ -483,42 +481,49 @@ nsDSURIContentListener::ReportXFOViolation(nsIDocShellTreeItem* aTopDocShellItem
  MOZ_ASSERT(aTopDocShellItem, "Need a top docshell");
  nsCOMPtr<nsPIDOMWindow> topOuterWindow = aTopDocShellItem->GetWindow();
-    if (!topOuterWindow)
+  if (!topOuterWindow) {
    return;
  }
  NS_ASSERTION(topOuterWindow->IsOuterWindow(), "Huh?");
  nsPIDOMWindow* topInnerWindow = topOuterWindow->GetCurrentInnerWindow();
-    if (!topInnerWindow)
+  if (!topInnerWindow) {
    return;
  }
  nsCOMPtr<nsIURI> topURI;
  nsCOMPtr<nsIDocument> document = aTopDocShellItem->GetDocument();
  nsresult rv = document->NodePrincipal()->GetURI(getter_AddRefs(topURI));
-    if (NS_FAILED(rv))
+  if (NS_FAILED(rv)) {
    return;
  }
-    if (!topURI)
+  if (!topURI) {
    return;
  }
  nsCString topURIString;
  nsCString thisURIString;
  rv = topURI->GetSpec(topURIString);
-    if (NS_FAILED(rv))
+  if (NS_FAILED(rv)) {
    return;
  }
  rv = aThisURI->GetSpec(thisURIString);
-    if (NS_FAILED(rv))
+  if (NS_FAILED(rv)) {
    return;
  }
  nsCOMPtr<nsIConsoleService> consoleService =
    do_GetService(NS_CONSOLESERVICE_CONTRACTID);
  nsCOMPtr<nsIScriptError> errorObject =
    do_CreateInstance(NS_SCRIPTERROR_CONTRACTID);
-    if (!consoleService || !errorObject)
+  if (!consoleService || !errorObject) {
    return;
  }
  nsString msg = NS_LITERAL_STRING("Load denied by X-Frame-Options: ");
  msg.Append(NS_ConvertUTF8toUTF16(thisURIString));
@@ -541,8 +546,9 @@ nsDSURIContentListener::ReportXFOViolation(nsIDocShellTreeItem* aTopDocShellItem
                                     nsIScriptError::errorFlag,
                                     "X-Frame-Options",
                                     topInnerWindow->WindowID());
-    if (NS_FAILED(rv))
+  if (NS_FAILED(rv)) {
    return;
  }
  consoleService->LogMessage(errorObject);
 }
--- a/docshell/base/nsDSURIContentListener.h
+++ b/docshell/base/nsDSURIContentListener.h
@@ -16,12 +16,12 @@ class nsIWebNavigationInfo;
 class nsIHttpChannel;
 class nsAString;
-class nsDSURIContentListener MOZ_FINAL :
+class nsDSURIContentListener MOZ_FINAL
-    public nsIURIContentListener,
+  : public nsIURIContentListener
-    public nsSupportsWeakReference
+  , public nsSupportsWeakReference
 {
  friend class nsDocShell;
 public:
  NS_DECL_THREADSAFE_ISUPPORTS
  NS_DECL_NSIURICONTENTLISTENER
@@ -32,7 +32,8 @@ protected:
  explicit nsDSURIContentListener(nsDocShell* aDocShell);
  virtual ~nsDSURIContentListener();
-    void DropDocShellreference() {
+  void DropDocShellReference()
  {
    mDocShell = nullptr;
    mExistingJPEGRequest = nullptr;
    mExistingJPEGStreamListener = nullptr;
@@ -40,11 +41,12 @@ protected:
  // Determine if X-Frame-Options allows content to be framed
  // as a subdocument
-    bool CheckFrameOptions(nsIRequest* request);
+  bool CheckFrameOptions(nsIRequest* aRequest);
-    bool CheckOneFrameOptionsPolicy(nsIHttpChannel* httpChannel,
+  bool CheckOneFrameOptionsPolicy(nsIHttpChannel* aHttpChannel,
-                                    const nsAString& policy);
+                                  const nsAString& aPolicy);
-    enum XFOHeader {
+  enum XFOHeader
  {
    eDENY,
    eSAMEORIGIN,
    eALLOWFROM
@@ -53,6 +55,7 @@ protected:
  void ReportXFOViolation(nsIDocShellTreeItem* aTopDocShellItem,
                          nsIURI* aThisURI,
                          XFOHeader aHeader);
 protected:
  nsDocShell* mDocShell;
  // Hack to handle multipart images without creating a new viewer
--- a/docshell/base/nsDefaultURIFixup.cpp
+++ b/docshell/base/nsDefaultURIFixup.cpp
@@ -39,13 +39,10 @@ static bool sFixupKeywords = true;
 nsDefaultURIFixup::nsDefaultURIFixup()
 {
  /* member initializers and constructor code */
 }
 nsDefaultURIFixup::~nsDefaultURIFixup()
 {
  /* destructor code */
 }
 /* nsIURI createExposableURI (in nsIURI aURI); */
@@ -62,8 +59,7 @@ nsDefaultURIFixup::CreateExposableURI(nsIURI *aURI, nsIURI **aReturn)
  aURI->GetUserPass(userPass);
  // most of the time we can just AddRef and return
-    if (!isWyciwyg && userPass.IsEmpty())
+  if (!isWyciwyg && userPass.IsEmpty()) {
    {
    *aReturn = aURI;
    NS_ADDREF(*aReturn);
    return NS_OK;
@@ -71,28 +67,26 @@ nsDefaultURIFixup::CreateExposableURI(nsIURI *aURI, nsIURI **aReturn)
  // Rats, we have to massage the URI
  nsCOMPtr<nsIURI> uri;
-    if (isWyciwyg)
+  if (isWyciwyg) {
    {
    nsAutoCString path;
    nsresult rv = aURI->GetPath(path);
    NS_ENSURE_SUCCESS(rv, rv);
    uint32_t pathLength = path.Length();
-        if (pathLength <= 2)
+    if (pathLength <= 2) {
        {
      return NS_ERROR_FAILURE;
    }
-        // Path is of the form "//123/http://foo/bar", with a variable number of digits.
+    // Path is of the form "//123/http://foo/bar", with a variable number of
-        // To figure out where the "real" URL starts, search path for a '/', starting at 
+    // digits. To figure out where the "real" URL starts, search path for a '/',
-        // the third character.
+    // starting at the third character.
    int32_t slashIndex = path.FindChar('/', 2);
-        if (slashIndex == kNotFound)
+    if (slashIndex == kNotFound) {
        {
      return NS_ERROR_FAILURE;
    }
-        // Get the charset of the original URI so we can pass it to our fixed up URI.
+    // Get the charset of the original URI so we can pass it to our fixed up
    // URI.
    nsAutoCString charset;
    aURI->GetOriginCharset(charset);
@@ -100,17 +94,14 @@ nsDefaultURIFixup::CreateExposableURI(nsIURI *aURI, nsIURI **aReturn)
                   Substring(path, slashIndex + 1, pathLength - slashIndex - 1),
                   charset.get());
    NS_ENSURE_SUCCESS(rv, rv);
-    }
+  } else {
    else
    {
    // clone the URI so zapping user:pass doesn't change the original
    nsresult rv = aURI->Clone(getter_AddRefs(uri));
    NS_ENSURE_SUCCESS(rv, rv);
  }
  // hide user:pass unless overridden by pref
-    if (Preferences::GetBool("browser.fixup.hide_user_pass", true))
+  if (Preferences::GetBool("browser.fixup.hide_user_pass", true)) {
    {
    uri->SetUserPass(EmptyCString());
  }
@@ -122,7 +113,8 @@ nsDefaultURIFixup::CreateExposableURI(nsIURI *aURI, nsIURI **aReturn)
 /* nsIURI createFixupURI (in nsAUTF8String aURIText, in unsigned long aFixupFlags); */
 NS_IMETHODIMP
-nsDefaultURIFixup::CreateFixupURI(const nsACString& aStringURI, uint32_t aFixupFlags,
+nsDefaultURIFixup::CreateFixupURI(const nsACString& aStringURI,
                                  uint32_t aFixupFlags,
                                  nsIInputStream** aPostData, nsIURI** aURI)
 {
  nsCOMPtr<nsIURIFixupInfo> fixupInfo;
@@ -135,8 +127,10 @@ nsDefaultURIFixup::CreateFixupURI(const nsACString& aStringURI, uint32_t aFixupF
 }
 NS_IMETHODIMP
-nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixupFlags,
+nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI,
-                                   nsIInputStream **aPostData, nsIURIFixupInfo **aInfo)
+                                   uint32_t aFixupFlags,
                                   nsIInputStream** aPostData,
                                   nsIURIFixupInfo** aInfo)
 {
  NS_ENSURE_ARG(!aStringURI.IsEmpty());
@@ -154,7 +148,8 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
  nsRefPtr<nsDefaultURIFixupInfo> info = new nsDefaultURIFixupInfo(uriString);
  NS_ADDREF(*aInfo = info);
-    nsCOMPtr<nsIIOService> ioService = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
+  nsCOMPtr<nsIIOService> ioService =
    do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
  NS_ENSURE_SUCCESS(rv, rv);
  nsAutoCString scheme;
  ioService->ExtractScheme(aStringURI, scheme);
@@ -163,8 +158,7 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
  // after it. The easiest way to do that is to call this method again with the
  // "view-source:" lopped off and then prepend it again afterwards.
-    if (scheme.LowerCaseEqualsLiteral("view-source"))
+  if (scheme.LowerCaseEqualsLiteral("view-source")) {
    {
    nsCOMPtr<nsIURIFixupInfo> uriInfo;
    uint32_t newFixupFlags = aFixupFlags & ~FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP;
@@ -173,25 +167,25 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
                                   uriString.Length() -
                                   (sizeof("view-source:") - 1)),
                         newFixupFlags, aPostData, getter_AddRefs(uriInfo));
-        if (NS_FAILED(rv))
+    if (NS_FAILED(rv)) {
      return NS_ERROR_FAILURE;
    }
    nsAutoCString spec;
    nsCOMPtr<nsIURI> uri;
    uriInfo->GetPreferredURI(getter_AddRefs(uri));
-        if (!uri)
+    if (!uri) {
      return NS_ERROR_FAILURE;
    }
    uri->GetSpec(spec);
    uriString.AssignLiteral("view-source:");
    uriString.Append(spec);
-    }
+  } else {
    else {
    // Check for if it is a file URL
    nsCOMPtr<nsIURI> uri;
    FileURIFixup(uriString, getter_AddRefs(uri));
    // NB: FileURIFixup only returns a URI if it had to fix the protocol to
    // do so, so passing in file:///foo/bar will not hit this path:
-        if (uri)
+    if (uri) {
        {
      uri.swap(info->mFixedURI);
      info->mPreferredURI = info->mFixedURI;
      info->mFixupChangedProtocol = true;
@@ -199,8 +193,8 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
    }
 #if defined(XP_WIN)
-        // Not a file URL, so translate '\' to '/' for convenience in the common protocols
+    // Not a file URL, so translate '\' to '/' for convenience in the common
-        // e.g. catch
+    // protocols. E.g. catch
    //
    //   http:\\broken.com\address
    //   http:\\broken.com/blah
@@ -215,8 +209,7 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
    if (scheme.IsEmpty() ||
        scheme.LowerCaseEqualsLiteral("http") ||
        scheme.LowerCaseEqualsLiteral("https") ||
-            scheme.LowerCaseEqualsLiteral("ftp"))
+        scheme.LowerCaseEqualsLiteral("ftp")) {
        {
      // Walk the string replacing backslashes with forward slashes until
      // the end is reached, or a question mark, or a hash, or a forward
      // slash. The forward slash test is to stop before trampling over
@@ -227,10 +220,12 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
      uriString.BeginWriting(start);
      uriString.EndWriting(end);
      while (start != end) {
-                if (*start == '?' || *start == '#' || *start == '/')
+        if (*start == '?' || *start == '#' || *start == '/') {
          break;
-                if (*start == '\\')
+        }
        if (*start == '\\') {
          *start = '/';
        }
        ++start;
      }
    }
@@ -248,7 +243,8 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
    rv = Preferences::AddBoolVarCache(&sDNSFirstForSingleWords,
                                      "browser.fixup.dns_first_for_single_words",
                                      sDNSFirstForSingleWords);
-      MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to observe \"browser.fixup.dns_first_for_single_words\"");
+    MOZ_ASSERT(NS_SUCCEEDED(rv),
               "Failed to observe \"browser.fixup.dns_first_for_single_words\"");
    rv = Preferences::AddBoolVarCache(&sFixupKeywords, "keyword.enabled",
                                      sFixupKeywords);
@@ -258,7 +254,6 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
  // Fix up common scheme typos.
  if (sFixTypos && (aFixupFlags & FIXUP_FLAG_FIX_SCHEME_TYPOS)) {
    // Fast-path for common cases.
    if (scheme.IsEmpty() ||
        scheme.LowerCaseEqualsLiteral("http") ||
@@ -321,7 +316,8 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
      do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID);
    if (extProtService) {
      bool handlerExists = false;
-            rv = extProtService->ExternalProtocolHandlerExists(scheme.get(), &handlerExists);
+      rv = extProtService->ExternalProtocolHandlerExists(scheme.get(),
                                                         &handlerExists);
      if (NS_FAILED(rv)) {
        return rv;
      }
@@ -337,8 +333,9 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
  if (info->mFixedURI) {
    if (!info->mPreferredURI) {
-            if (aFixupFlags & FIXUP_FLAGS_MAKE_ALTERNATE_URI)
+      if (aFixupFlags & FIXUP_FLAGS_MAKE_ALTERNATE_URI) {
        info->mFixupCreatedAlternateURI = MakeAlternateURI(info->mFixedURI);
      }
      info->mPreferredURI = info->mFixedURI;
    }
    return NS_OK;
@@ -354,8 +351,7 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
  //   ://totallybroken.url.com
  //   //shorthand.url.com
  //
-    if (StringBeginsWith(uriString, NS_LITERAL_CSTRING("://")))
+  if (StringBeginsWith(uriString, NS_LITERAL_CSTRING("://"))) {
    {
    uriString = StringTail(uriString, uriString.Length() - 3);
    inputHadDuffProtocol = true;
  } else if (StringBeginsWith(uriString, NS_LITERAL_CSTRING("//"))) {
@@ -392,14 +388,13 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
  // be whitelisted?
  if (info->mFixedURI) {
    if (aFixupFlags & FIXUP_FLAG_REQUIRE_WHITELISTED_HOST) {
      nsAutoCString asciiHost;
      if (NS_SUCCEEDED(info->mFixedURI->GetAsciiHost(asciiHost)) &&
          !asciiHost.IsEmpty()) {
        uint32_t dotLoc = uint32_t(asciiHost.FindChar('.'));
-                if ((dotLoc == uint32_t(kNotFound) || dotLoc == asciiHost.Length() - 1)) {
+        if ((dotLoc == uint32_t(kNotFound) ||
             dotLoc == asciiHost.Length() - 1)) {
          if (IsDomainWhitelisted(asciiHost, dotLoc)) {
            info->mPreferredURI = info->mFixedURI;
          }
@@ -423,7 +418,8 @@ nsDefaultURIFixup::GetFixupURIInfo(const nsACString& aStringURI, uint32_t aFixup
  return rv;
 }
-NS_IMETHODIMP nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
+NS_IMETHODIMP
 nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
                                nsIInputStream** aPostData,
                                nsIURIFixupInfo** aInfo)
 {
@@ -451,7 +447,8 @@ NS_IMETHODIMP nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
    ipc::OptionalInputStreamParams postData;
    ipc::OptionalURIParams uri;
    nsAutoString providerName;
-        if (!contentChild->SendKeywordToURI(keyword, &providerName, &postData, &uri)) {
+    if (!contentChild->SendKeywordToURI(keyword, &providerName, &postData,
                                        &uri)) {
      return NS_ERROR_FAILURE;
    }
@@ -473,7 +470,8 @@ NS_IMETHODIMP nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
 #ifdef MOZ_TOOLKIT_SEARCH
  // Try falling back to the search service's default search engine
-    nsCOMPtr<nsIBrowserSearchService> searchSvc = do_GetService("@mozilla.org/browser/search-service;1");
+  nsCOMPtr<nsIBrowserSearchService> searchSvc =
    do_GetService("@mozilla.org/browser/search-service;1");
  if (searchSvc) {
    nsCOMPtr<nsISearchEngine> defaultEngine;
    searchSvc->GetDefaultEngine(getter_AddRefs(defaultEngine));
@@ -482,9 +480,11 @@ NS_IMETHODIMP nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
      nsAutoString responseType;
      // We allow default search plugins to specify alternate
      // parameters that are specific to keyword searches.
-            NS_NAMED_LITERAL_STRING(mozKeywordSearch, "application/x-moz-keywordsearch");
+      NS_NAMED_LITERAL_STRING(mozKeywordSearch,
                              "application/x-moz-keywordsearch");
      bool supportsResponseType = false;
-            defaultEngine->SupportsResponseType(mozKeywordSearch, &supportsResponseType);
+      defaultEngine->SupportsResponseType(mozKeywordSearch,
                                          &supportsResponseType);
      if (supportsResponseType) {
        responseType.Assign(mozKeywordSearch);
      }
@@ -527,7 +527,8 @@ nsDefaultURIFixup::TryKeywordFixupForURIInfo(const nsACString & aURIString,
                                             nsIInputStream** aPostData)
 {
  nsCOMPtr<nsIURIFixupInfo> keywordInfo;
-    nsresult rv = KeywordToURI(aURIString, aPostData, getter_AddRefs(keywordInfo));
+  nsresult rv = KeywordToURI(aURIString, aPostData,
                             getter_AddRefs(keywordInfo));
  if (NS_SUCCEEDED(rv)) {
    keywordInfo->GetKeywordProviderName(aFixupInfo->mKeywordProviderName);
    keywordInfo->GetKeywordAsSent(aFixupInfo->mKeywordAsSent);
@@ -536,14 +537,13 @@ nsDefaultURIFixup::TryKeywordFixupForURIInfo(const nsACString & aURIString,
  return rv;
 }
-bool nsDefaultURIFixup::MakeAlternateURI(nsIURI *aURI)
+bool
-{
+nsDefaultURIFixup::MakeAlternateURI(nsIURI* aURI)
    if (!Preferences::GetRootBranch())
 {
  if (!Preferences::GetRootBranch()) {
    return false;
  }
-    if (!Preferences::GetBool("browser.fixup.alternate.enabled", true))
+  if (!Preferences::GetBool("browser.fixup.alternate.enabled", true)) {
    {
    return false;
  }
@@ -572,56 +572,46 @@ bool nsDefaultURIFixup::MakeAlternateURI(nsIURI *aURI)
  oldHost.BeginReading(iter);
  oldHost.EndReading(iterEnd);
  while (iter != iterEnd) {
-        if (*iter == '.')
+    if (*iter == '.') {
      numDots++;
    }
    ++iter;
  }
  // Get the prefix and suffix to stick onto the new hostname. By default these
  // are www. & .com but they could be any other value, e.g. www. & .org
  nsAutoCString prefix("www.");
  nsAdoptingCString prefPrefix =
    Preferences::GetCString("browser.fixup.alternate.prefix");
-    if (prefPrefix)
+  if (prefPrefix) {
    {
    prefix.Assign(prefPrefix);
  }
  nsAutoCString suffix(".com");
  nsAdoptingCString prefSuffix =
    Preferences::GetCString("browser.fixup.alternate.suffix");
-    if (prefSuffix)
+  if (prefSuffix) {
    {
    suffix.Assign(prefSuffix);
  }
-    if (numDots == 0)
+  if (numDots == 0) {
    {
    newHost.Assign(prefix);
    newHost.Append(oldHost);
    newHost.Append(suffix);
-    }
+  } else if (numDots == 1) {
    else if (numDots == 1)
    {
    if (!prefix.IsEmpty() &&
        oldHost.EqualsIgnoreCase(prefix.get(), prefix.Length())) {
      newHost.Assign(oldHost);
      newHost.Append(suffix);
-        }
+    } else if (!suffix.IsEmpty()) {
        else if (!suffix.IsEmpty()) {
      newHost.Assign(prefix);
      newHost.Append(oldHost);
-        }
+    } else {
        else
        {
      // Do nothing
      return false;
    }
-    }
+  } else {
    else
    {
    // Do nothing
    return false;
  }
@@ -639,7 +629,8 @@ bool nsDefaultURIFixup::MakeAlternateURI(nsIURI *aURI)
 * Check if the host name starts with ftp\d*\. and it's not directly followed
 * by the tld.
 */
-bool nsDefaultURIFixup::IsLikelyFTP(const nsCString &aHostSpec)
+bool
 nsDefaultURIFixup::IsLikelyFTP(const nsCString& aHostSpec)
 {
  bool likelyFTP = false;
  if (aHostSpec.EqualsIgnoreCase("ftp", 3)) {
@@ -649,13 +640,11 @@ bool nsDefaultURIFixup::IsLikelyFTP(const nsCString &aHostSpec)
    aHostSpec.EndReading(end);
    iter.advance(3); // move past the "ftp" part
-        while (iter != end)
+    while (iter != end) {
        {
      if (*iter == '.') {
        // now make sure the name has at least one more dot in it
        ++iter;
-                while (iter != end)
+        while (iter != end) {
                {
          if (*iter == '.') {
            likelyFTP = true;
            break;
@@ -663,8 +652,7 @@ bool nsDefaultURIFixup::IsLikelyFTP(const nsCString &aHostSpec)
          ++iter;
        }
        break;
-            }
+      } else if (!nsCRT::IsAsciiDigit(*iter)) {
            else if (!nsCRT::IsAsciiDigit(*iter)) {
        break;
      }
      ++iter;
@@ -673,45 +661,43 @@ bool nsDefaultURIFixup::IsLikelyFTP(const nsCString &aHostSpec)
  return likelyFTP;
 }
-nsresult nsDefaultURIFixup::FileURIFixup(const nsACString& aStringURI,
+nsresult
-                                         nsIURI** aURI)
+nsDefaultURIFixup::FileURIFixup(const nsACString& aStringURI, nsIURI** aURI)
 {
  nsAutoCString uriSpecOut;
  nsresult rv = ConvertFileToStringURI(aStringURI, uriSpecOut);
-    if (NS_SUCCEEDED(rv))
+  if (NS_SUCCEEDED(rv)) {
    {
    // if this is file url, uriSpecOut is already in FS charset
-        if(NS_SUCCEEDED(NS_NewURI(aURI, uriSpecOut.get(), nullptr)))
+    if (NS_SUCCEEDED(NS_NewURI(aURI, uriSpecOut.get(), nullptr))) {
      return NS_OK;
    }
  }
  return NS_ERROR_FAILURE;
 }
-nsresult nsDefaultURIFixup::ConvertFileToStringURI(const nsACString& aIn,
+nsresult
-                                                   nsCString& aOut)
+nsDefaultURIFixup::ConvertFileToStringURI(const nsACString& aIn,
                                          nsCString& aResult)
 {
  bool attemptFixup = false;
 #if defined(XP_WIN)
  // Check for \ in the url-string or just a drive (PC)
  if (kNotFound != aIn.FindChar('\\') ||
-       (aIn.Length() == 2 && (aIn.Last() == ':' || aIn.Last() == '|')))
+      (aIn.Length() == 2 && (aIn.Last() == ':' || aIn.Last() == '|'))) {
    {
    attemptFixup = true;
  }
 #elif defined(XP_UNIX)
  // Check if it starts with / (UNIX)
-    if(aIn.First() == '/')
+  if (aIn.First() == '/') {
    {
    attemptFixup = true;
  }
 #else
  // Do nothing (All others for now)
 #endif
-    if (attemptFixup)
+  if (attemptFixup) {
    {
    // Test if this is a valid path by trying to create a local file
    // object. The URL of that is returned if successful.
@@ -726,8 +712,8 @@ nsresult nsDefaultURIFixup::ConvertFileToStringURI(const nsACString& aIn,
    // in order to really fix the problem, we need to change the
    // nsICmdLineService interface to use wstring to pass paramenters
    // instead of string since path name and other argument could be
-        // in non ascii.(see bug 87127) Since it is too risky to make interface change right
+    // in non ascii.(see bug 87127) Since it is too risky to make interface
-        // now, we decide not to do so now.
+    // change right now, we decide not to do so now.
    // Therefore, the aIn we receive here maybe already in damage form
    // (e.g. treat every bytes as ISO-8859-1 and cast up to char16_t
    //  while the real data could be in file system charset )
@@ -750,16 +736,15 @@ nsresult nsDefaultURIFixup::ConvertFileToStringURI(const nsACString& aIn,
    NS_ConvertUTF8toUTF16 in(aIn);
    if (PossiblyByteExpandedFileName(in)) {
      // removes high byte
-          rv = NS_NewNativeLocalFile(NS_LossyConvertUTF16toASCII(in), false, getter_AddRefs(filePath));
+      rv = NS_NewNativeLocalFile(NS_LossyConvertUTF16toASCII(in), false,
-        }
+                                 getter_AddRefs(filePath));
-        else {
+    } else {
      // input is unicode
      rv = NS_NewLocalFile(in, false, getter_AddRefs(filePath));
    }
-        if (NS_SUCCEEDED(rv))
+    if (NS_SUCCEEDED(rv)) {
-        {
+      NS_GetURLSpecFromFile(filePath, aResult);
            NS_GetURLSpecFromFile(filePath, aOut);
      return NS_OK;
    }
  }
@@ -767,7 +752,6 @@ nsresult nsDefaultURIFixup::ConvertFileToStringURI(const nsACString& aIn,
  return NS_ERROR_FAILURE;
 }
 nsresult
 nsDefaultURIFixup::FixupURIProtocol(const nsACString& aURIString,
                                    nsDefaultURIFixupInfo* aFixupInfo,
@@ -791,26 +775,28 @@ nsDefaultURIFixup::FixupURIProtocol(const nsACString & aURIString,
      (firstDelim != -1 && schemeDelim > firstDelim)) {
    // find host name
    int32_t hostPos = uriString.FindCharInSet("/:?#");
-        if (hostPos == -1)
+    if (hostPos == -1) {
      hostPos = uriString.Length();
    }
    // extract host name
    nsAutoCString hostSpec;
    uriString.Left(hostSpec, hostPos);
    // insert url spec corresponding to host name
-        if (IsLikelyFTP(hostSpec))
+    if (IsLikelyFTP(hostSpec)) {
      uriString.InsertLiteral("ftp://", 0);
-        else
+    } else {
      uriString.InsertLiteral("http://", 0);
    }
    aFixupInfo->mFixupChangedProtocol = true;
  } // end if checkprotocol
  return NS_NewURI(aURI, uriString, nullptr);
 }
-
+bool
-bool nsDefaultURIFixup::PossiblyHostPortUrl(const nsACString &aUrl)
+nsDefaultURIFixup::PossiblyHostPortUrl(const nsACString& aUrl)
 {
  // Oh dear, the protocol is invalid. Test if the protocol might
  // actually be a url without a protocol:
@@ -844,36 +830,30 @@ bool nsDefaultURIFixup::PossiblyHostPortUrl(const nsACString &aUrl)
  aUrl.EndReading(iterEnd);
  nsACString::const_iterator iter = iterBegin;
-    while (iter != iterEnd)
+  while (iter != iterEnd) {
    {
    uint32_t chunkSize = 0;
    // Parse a chunk of the address
    while (iter != iterEnd &&
           (*iter == '-' ||
            nsCRT::IsAsciiAlpha(*iter) ||
-                nsCRT::IsAsciiDigit(*iter)))
+            nsCRT::IsAsciiDigit(*iter))) {
        {
      ++chunkSize;
      ++iter;
    }
-        if (chunkSize == 0 || iter == iterEnd)
+    if (chunkSize == 0 || iter == iterEnd) {
        {
      return false;
    }
-        if (*iter == ':')
+    if (*iter == ':') {
        {
      // Go onto checking the for the digits
      break;
    }
-        if (*iter != '.')
+    if (*iter != '.') {
        {
      // Whatever it is, it ain't a hostname!
      return false;
    }
    ++iter;
  }
-    if (iter == iterEnd)
+  if (iter == iterEnd) {
    {
    // No point continuing since there is no colon
    return false;
  }
@@ -883,25 +863,18 @@ bool nsDefaultURIFixup::PossiblyHostPortUrl(const nsACString &aUrl)
  // next forward slash (or end of string)
  uint32_t digitCount = 0;
-    while (iter != iterEnd && digitCount <= 5)
+  while (iter != iterEnd && digitCount <= 5) {
-    {
+    if (nsCRT::IsAsciiDigit(*iter)) {
        if (nsCRT::IsAsciiDigit(*iter))
        {
      digitCount++;
-        }
+    } else if (*iter == '/') {
        else if (*iter == '/')
        {
      break;
-        }
+    } else {
        else
        {
      // Whatever it is, it ain't a port!
      return false;
    }
    ++iter;
  }
-    if (digitCount == 0 || digitCount > 5)
+  if (digitCount == 0 || digitCount > 5) {
    {
    // No digits or more digits than a port would have.
    return false;
  }
@@ -910,7 +883,8 @@ bool nsDefaultURIFixup::PossiblyHostPortUrl(const nsACString &aUrl)
  return true;
 }
-bool nsDefaultURIFixup::PossiblyByteExpandedFileName(const nsAString& aIn)
+bool
 nsDefaultURIFixup::PossiblyByteExpandedFileName(const nsAString& aIn)
 {
  // XXXXX HACK XXXXX : please don't copy this code.
  // There are cases where aIn contains the locale byte chars padded to short
@@ -922,10 +896,10 @@ bool nsDefaultURIFixup::PossiblyByteExpandedFileName(const nsAString& aIn)
  nsReadingIterator<char16_t> iterEnd;
  aIn.BeginReading(iter);
  aIn.EndReading(iterEnd);
-    while (iter != iterEnd)
+  while (iter != iterEnd) {
-    {
+    if (*iter >= 0x0080 && *iter <= 0x00FF) {
        if (*iter >= 0x0080 && *iter <= 0x00FF)
      return true;
    }
    ++iter;
  }
  return false;
@@ -1010,7 +984,8 @@ nsDefaultURIFixup::KeywordURIFixup(const nsACString & aURIString,
      firstSpaceLoc = pos;
    } else if (*iter == '?' && firstQMarkLoc == uint32_t(kNotFound)) {
      firstQMarkLoc = pos;
-        } else if ((*iter == '\'' || *iter == '"') && firstQuoteLoc == uint32_t(kNotFound)) {
+    } else if ((*iter == '\'' || *iter == '"') &&
               firstQuoteLoc == uint32_t(kNotFound)) {
      firstQuoteLoc = pos;
    } else if (*iter == '[') {
      lastLSBracketLoc = pos;
@@ -1035,11 +1010,13 @@ nsDefaultURIFixup::KeywordURIFixup(const nsACString & aURIString,
  nsAutoCString asciiHost;
  nsAutoCString host;
-    bool isValidAsciiHost = aFixupInfo->mFixedURI &&
+  bool isValidAsciiHost =
    aFixupInfo->mFixedURI &&
    NS_SUCCEEDED(aFixupInfo->mFixedURI->GetAsciiHost(asciiHost)) &&
    !asciiHost.IsEmpty();
-    bool isValidHost = aFixupInfo->mFixedURI &&
+  bool isValidHost =
    aFixupInfo->mFixedURI &&
    NS_SUCCEEDED(aFixupInfo->mFixedURI->GetHost(host)) &&
    !host.IsEmpty();
@@ -1073,44 +1050,52 @@ nsDefaultURIFixup::KeywordURIFixup(const nsACString & aURIString,
  nsresult rv = NS_OK;
  // We do keyword lookups if a space or quote preceded the dot, colon
-    // or question mark (or if the latter is not found, or if the input starts with a question mark)
+  // or question mark (or if the latter is not found, or if the input starts
  // with a question mark)
  if (((firstSpaceLoc < firstDotLoc || firstQuoteLoc < firstDotLoc) &&
       (firstSpaceLoc < firstColonLoc || firstQuoteLoc < firstColonLoc) &&
-         (firstSpaceLoc < firstQMarkLoc || firstQuoteLoc < firstQMarkLoc)) || firstQMarkLoc == 0) {
+       (firstSpaceLoc < firstQMarkLoc || firstQuoteLoc < firstQMarkLoc)) ||
-        rv = TryKeywordFixupForURIInfo(aFixupInfo->mOriginalInput, aFixupInfo, aPostData);
+      firstQMarkLoc == 0) {
    rv = TryKeywordFixupForURIInfo(aFixupInfo->mOriginalInput, aFixupInfo,
                                   aPostData);
    // ... or when the host is the same as asciiHost and there are no
    // characters from [a-z][A-Z]
  } else if (isValidAsciiHost && isValidHost && !hasAsciiAlpha &&
             host.EqualsIgnoreCase(asciiHost.get())) {
    if (!sDNSFirstForSingleWords) {
-            rv = TryKeywordFixupForURIInfo(aFixupInfo->mOriginalInput, aFixupInfo, aPostData);
+      rv = TryKeywordFixupForURIInfo(aFixupInfo->mOriginalInput, aFixupInfo,
                                     aPostData);
    }
  }
  // ... or if there is no question mark or colon, and there is either no
  // dot, or exactly 1 and it is the first or last character of the input:
  else if ((firstDotLoc == uint32_t(kNotFound) ||
-              (foundDots == 1 && (firstDotLoc == 0 || firstDotLoc == aURIString.Length() - 1))) &&
+            (foundDots == 1 && (firstDotLoc == 0 ||
-              firstColonLoc == uint32_t(kNotFound) && firstQMarkLoc == uint32_t(kNotFound)) {
+                                firstDotLoc == aURIString.Length() - 1))) &&
-
+           firstColonLoc == uint32_t(kNotFound) &&
           firstQMarkLoc == uint32_t(kNotFound)) {
    if (isValidAsciiHost && IsDomainWhitelisted(asciiHost, firstDotLoc)) {
      return NS_OK;
    }
-        // ... unless there are no dots, and a slash, and alpha characters, and this is a valid host:
+    // ... unless there are no dots, and a slash, and alpha characters, and
-        if (firstDotLoc == uint32_t(kNotFound) && lastSlashLoc != uint32_t(kNotFound) &&
+    // this is a valid host:
    if (firstDotLoc == uint32_t(kNotFound) &&
        lastSlashLoc != uint32_t(kNotFound) &&
        hasAsciiAlpha && isValidAsciiHost) {
      return NS_OK;
    }
    // If we get here, we don't have a valid URI, or we did but the
    // host is not whitelisted, so we do a keyword search *anyway*:
-        rv = TryKeywordFixupForURIInfo(aFixupInfo->mOriginalInput, aFixupInfo, aPostData);
+    rv = TryKeywordFixupForURIInfo(aFixupInfo->mOriginalInput, aFixupInfo,
                                   aPostData);
  }
  return rv;
 }
-bool nsDefaultURIFixup::IsDomainWhitelisted(const nsAutoCString aAsciiHost,
+bool
 nsDefaultURIFixup::IsDomainWhitelisted(const nsAutoCString aAsciiHost,
                                       const uint32_t aDotLoc)
 {
  if (sDNSFirstForSingleWords) {
@@ -1132,29 +1117,26 @@ bool nsDefaultURIFixup::IsDomainWhitelisted(const nsAutoCString aAsciiHost,
  return Preferences::GetBool(pref.get(), false);
 }
-
+nsresult
-nsresult NS_NewURIFixup(nsIURIFixup **aURIFixup)
+NS_NewURIFixup(nsIURIFixup** aURIFixup)
 {
  nsDefaultURIFixup* fixup = new nsDefaultURIFixup;
-    if (fixup == nullptr)
+  if (!fixup) {
    {
    return NS_ERROR_OUT_OF_MEMORY;
  }
  return fixup->QueryInterface(NS_GET_IID(nsIURIFixup), (void**)aURIFixup);
 }
 /* Implementation of nsIURIFixupInfo */
 NS_IMPL_ISUPPORTS(nsDefaultURIFixupInfo, nsIURIFixupInfo)
-nsDefaultURIFixupInfo::nsDefaultURIFixupInfo(const nsACString& aOriginalInput):
+nsDefaultURIFixupInfo::nsDefaultURIFixupInfo(const nsACString& aOriginalInput)
-    mFixupChangedProtocol(false),
+  : mFixupChangedProtocol(false)
-    mFixupCreatedAlternateURI(false)
+  , mFixupCreatedAlternateURI(false)
 {
  mOriginalInput = aOriginalInput;
 }
 nsDefaultURIFixupInfo::~nsDefaultURIFixupInfo()
 {
 }
@@ -1191,36 +1173,36 @@ nsDefaultURIFixupInfo::GetFixedURI(nsIURI** aFixedURI)
 }
 NS_IMETHODIMP
-nsDefaultURIFixupInfo::GetKeywordProviderName(nsAString& aOut)
+nsDefaultURIFixupInfo::GetKeywordProviderName(nsAString& aResult)
 {
-    aOut = mKeywordProviderName;
+  aResult = mKeywordProviderName;
  return NS_OK;
 }
 NS_IMETHODIMP
-nsDefaultURIFixupInfo::GetKeywordAsSent(nsAString& aOut)
+nsDefaultURIFixupInfo::GetKeywordAsSent(nsAString& aResult)
 {
-    aOut = mKeywordAsSent;
+  aResult = mKeywordAsSent;
  return NS_OK;
 }
 NS_IMETHODIMP
-nsDefaultURIFixupInfo::GetFixupChangedProtocol(bool* aOut)
+nsDefaultURIFixupInfo::GetFixupChangedProtocol(bool* aResult)
 {
-    *aOut = mFixupChangedProtocol;
+  *aResult = mFixupChangedProtocol;
  return NS_OK;
 }
 NS_IMETHODIMP
-nsDefaultURIFixupInfo::GetFixupCreatedAlternateURI(bool* aOut)
+nsDefaultURIFixupInfo::GetFixupCreatedAlternateURI(bool* aResult)
 {
-    *aOut = mFixupCreatedAlternateURI;
+  *aResult = mFixupCreatedAlternateURI;
  return NS_OK;
 }
 NS_IMETHODIMP
-nsDefaultURIFixupInfo::GetOriginalInput(nsACString& aInput)
+nsDefaultURIFixupInfo::GetOriginalInput(nsACString& aResult)
 {
-    aInput = mOriginalInput;
+  aResult = mOriginalInput;
  return NS_OK;
 }
--- a/docshell/base/nsDefaultURIFixup.h
+++ b/docshell/base/nsDefaultURIFixup.h
@@ -26,7 +26,7 @@ protected:
 private:
  /* additional members */
  nsresult FileURIFixup(const nsACString& aStringURI, nsIURI** aURI);
-    nsresult ConvertFileToStringURI(const nsACString& aIn, nsCString& aOut);
+  nsresult ConvertFileToStringURI(const nsACString& aIn, nsCString& aResult);
  nsresult FixupURIProtocol(const nsACString& aIn,
                            nsDefaultURIFixupInfo* aFixupInfo,
                            nsIURI** aURI);
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -94,7 +94,8 @@ class ProfilerMarkerTracing;
 /* load types were moved to nsDocShellLoadTypes.h */
 /* internally used ViewMode types */
-enum ViewMode {
+enum ViewMode
 {
  viewNormal = 0x0,
  viewSource = 0x1
 };
@@ -123,34 +124,36 @@ protected:
  virtual ~nsRefreshTimer();
 };
-typedef enum {
+enum eCharsetReloadState
 {
  eCharsetReloadInit,
  eCharsetReloadRequested,
  eCharsetReloadStopOrigional
-} eCharsetReloadState;
+};
 //*****************************************************************************
 //***    nsDocShell
 //*****************************************************************************
-class nsDocShell MOZ_FINAL : public nsDocLoader,
+class nsDocShell MOZ_FINAL
-                             public nsIDocShell,
+  : public nsDocLoader
-                             public nsIWebNavigation,
+  , public nsIDocShell
-                             public nsIBaseWindow,
+  , public nsIWebNavigation
-                             public nsIScrollable,
+  , public nsIBaseWindow
-                             public nsITextScroll,
+  , public nsIScrollable
-                             public nsIDocCharset,
+  , public nsITextScroll
-                             public nsIContentViewerContainer,
+  , public nsIDocCharset
-                             public nsIRefreshURI,
+  , public nsIContentViewerContainer
-                             public nsIWebProgressListener,
+  , public nsIRefreshURI
-                             public nsIWebPageDescriptor,
+  , public nsIWebProgressListener
-                             public nsIAuthPromptProvider,
+  , public nsIWebPageDescriptor
-                             public nsILoadContext,
+  , public nsIAuthPromptProvider
-                             public nsIWebShellServices,
+  , public nsILoadContext
-                             public nsILinkHandler,
+  , public nsIWebShellServices
-                             public nsIClipboardCommands,
+  , public nsILinkHandler
-                             public nsIDOMStorageManager,
+  , public nsIClipboardCommands
-                             public mozilla::SupportsWeakPtr<nsDocShell>
+  , public nsIDOMStorageManager
  , public mozilla::SupportsWeakPtr<nsDocShell>
 {
  friend class nsDSURIContentListener;
@@ -214,7 +217,8 @@ public:
  NS_IMETHOD OnLeaveLink() MOZ_OVERRIDE;
  nsDocShellInfoLoadType ConvertLoadTypeToDocShellLoadInfo(uint32_t aLoadType);
-    uint32_t ConvertDocShellLoadInfoToLoadType(nsDocShellInfoLoadType aDocShellLoadType);
+  uint32_t ConvertDocShellLoadInfoToLoadType(
      nsDocShellInfoLoadType aDocShellLoadType);
  // Don't use NS_DECL_NSILOADCONTEXT because some of nsILoadContext's methods
  // are shared with nsIDocShell (appID, etc.) and can't be declared twice.
@@ -271,6 +275,7 @@ public:
  // Global counter for how many docShells are currently recording profile
  // timeline markers
  static unsigned long gProfileTimelineRecordingsCount;
 protected:
  // Object Management
  virtual ~nsDocShell();
@@ -284,10 +289,12 @@ protected:
                                         nsIURI* aBaseURI,
                                         bool aTryToSaveOldPresentation = true);
  nsresult CreateContentViewer(const char* aContentType,
-        nsIRequest * request, nsIStreamListener ** aContentHandler);
+                               nsIRequest* aRequest,
                               nsIStreamListener** aContentHandler);
  nsresult NewContentViewerObj(const char* aContentType,
-        nsIRequest * request, nsILoadGroup * aLoadGroup,
+                               nsIRequest* aRequest, nsILoadGroup* aLoadGroup,
-        nsIStreamListener ** aContentHandler, nsIContentViewer ** aViewer);
+                               nsIStreamListener** aContentHandler,
                               nsIContentViewer** aViewer);
  nsresult SetupNewViewer(nsIContentViewer* aNewViewer);
  void SetupReferrerFromChannel(nsIChannel* aChannel);
@@ -316,14 +323,14 @@ protected:
                     const nsAString& aFileName,
                     nsIInputStream* aPostData,
                     nsIInputStream* aHeadersData,
-                       bool firstParty,
+                     bool aFirstParty,
                     nsIDocShell** aDocShell,
                     nsIRequest** aRequest,
                     bool aIsNewWindowTarget,
                     bool aBypassClassifier,
                     bool aForceAllowCookies,
                     const nsAString& aSrcdoc,
-                       nsIURI * baseURI,
+                     nsIURI* aBaseURI,
                     nsContentPolicyType aContentPolicyType);
  nsresult AddHeadersToChannel(nsIInputStream* aHeadersData,
                               nsIChannel* aChannel);
@@ -331,7 +338,7 @@ protected:
                         nsIURILoader* aURILoader,
                         bool aBypassClassifier);
-    nsresult ScrollToAnchor(nsACString & curHash, nsACString & newHash,
+  nsresult ScrollToAnchor(nsACString& aCurHash, nsACString& aNewHash,
                          uint32_t aLoadType);
  // Returns true if would have called FireOnLocationChange,
@@ -359,7 +366,7 @@ protected:
                bool aCloneSHChildren);
  void SetReferrerURI(nsIURI* aURI);
-    void SetReferrerPolicy(uint32_t referrerPolicy);
+  void SetReferrerPolicy(uint32_t aReferrerPolicy);
  // Session History
  bool ShouldAddToSessionHistory(nsIURI* aURI);
@@ -377,7 +384,7 @@ protected:
                                   bool aCloneChildren);
  nsresult AddChildSHEntryInternal(nsISHEntry* aCloneRef, nsISHEntry* aNewEntry,
-                                     int32_t aChildOffset, uint32_t loadType,
+                                   int32_t aChildOffset, uint32_t aLoadType,
                                   bool aCloneChildren);
  nsresult LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType);
@@ -399,8 +406,7 @@ protected:
                                  nsISHEntry** aDestEntry);
  // Child-walking callback for CloneAndReplace
-    static nsresult CloneAndReplaceChild(nsISHEntry *aEntry,
+  static nsresult CloneAndReplaceChild(nsISHEntry* aEntry, nsDocShell* aShell,
                                         nsDocShell *aShell,
                                       int32_t aChildIndex, void* aData);
  nsresult GetRootSessionHistory(nsISHistory** aReturn);
@@ -423,8 +429,7 @@ protected:
  void SetHistoryEntry(nsCOMPtr<nsISHEntry>* aPtr, nsISHEntry* aEntry);
  // Child-walking callback for SetHistoryEntry
-    static nsresult SetChildHistoryEntry(nsISHEntry *aEntry,
+  static nsresult SetChildHistoryEntry(nsISHEntry* aEntry, nsDocShell* aShell,
                                         nsDocShell *aShell,
                                       int32_t aEntryIndex, void* aData);
  // Callback prototype for WalkHistoryEntries.
@@ -550,11 +555,10 @@ protected:
  nsresult SetBaseUrlForWyciwyg(nsIContentViewer* aContentViewer);
-    static  inline  uint32_t
+  static inline uint32_t PRTimeToSeconds(PRTime aTimeUsec)
    PRTimeToSeconds(PRTime t_usec)
  {
-      PRTime usec_per_sec = PR_USEC_PER_SEC;
+    PRTime usecPerSec = PR_USEC_PER_SEC;
-      return  uint32_t(t_usec /= usec_per_sec);
+    return uint32_t(aTimeUsec /= usecPerSec);
  }
  inline bool UseErrorPages()
@@ -575,7 +579,7 @@ protected:
  // Sets the current document's current state object to the given SHEntry's
  // state object.  The current state object is eventually given to the page
  // in the PopState event.
-    nsresult SetDocCurrentStateObj(nsISHEntry *shEntry);
+  nsresult SetDocCurrentStateObj(nsISHEntry* aShEntry);
  nsresult CheckLoadingPermissions();
@@ -648,8 +652,8 @@ protected:
  nsresult BeginRestoreChildren();
  // Method to get our current position and size without flushing
-    void DoGetPositionAndSize(int32_t * x, int32_t * y, int32_t * cx,
+  void DoGetPositionAndSize(int32_t* aX, int32_t* aY, int32_t* aWidth,
-                              int32_t * cy);
+                            int32_t* aHeight);
  // Call this when a URI load is handed to us (via OnLinkClick or
  // InternalLoad).  This makes sure that we're not inside unload, or that if
@@ -662,8 +666,8 @@ protected:
  nsIDOMStorageManager* TopSessionStorageManager();
  // helpers for executing commands
-    nsresult GetControllerForCommand(const char *inCommand,
+  nsresult GetControllerForCommand(const char* aCommand,
-                                     nsIController** outController);
+                                   nsIController** aResult);
  nsresult EnsureCommandHandler();
  nsIChannel* GetCurrentDocChannel();
@@ -678,9 +682,11 @@ protected:
  bool DoAppRedirectIfNeeded(nsIURI* aURI,
                             nsIDocShellLoadInfo* aLoadInfo,
                             bool aFirstParty);
 protected:
-    nsresult GetCurScrollPos(int32_t scrollOrientation, int32_t * curPos);
+  nsresult GetCurScrollPos(int32_t aScrollOrientation, int32_t* aCurPos);
-    nsresult SetCurScrollPosEx(int32_t curHorizontalPos, int32_t curVerticalPos);
+  nsresult SetCurScrollPosEx(int32_t aCurHorizontalPos,
                             int32_t aCurVerticalPos);
  // Override the parent setter from nsDocLoader
  virtual nsresult SetDocLoaderParent(nsDocLoader* aLoader) MOZ_OVERRIDE;
@@ -695,22 +701,24 @@ protected:
 public:
  // Event type dispatched by RestorePresentation
-    class RestorePresentationEvent : public nsRunnable {
+  class RestorePresentationEvent : public nsRunnable
  {
  public:
    NS_DECL_NSIRUNNABLE
-        explicit RestorePresentationEvent(nsDocShell *ds) : mDocShell(ds) {}
+    explicit RestorePresentationEvent(nsDocShell* aDs) : mDocShell(aDs) {}
    void Revoke() { mDocShell = nullptr; }
  private:
    nsRefPtr<nsDocShell> mDocShell;
  };
 protected:
 protected:
  bool JustStartedNetworkLoad();
  nsresult CreatePrincipalFromReferrer(nsIURI* aReferrer,
-                                         nsIPrincipal** outPrincipal);
+                                       nsIPrincipal** aResult);
-    enum FrameType {
+  enum FrameType
  {
    eFrameTypeRegular,
    eFrameTypeBrowser,
    eFrameTypeApp
@@ -852,7 +860,8 @@ protected:
  // parent across the content boundary has allowfullscreen=true in all its
  // containing iframes. mFullscreenAllowed defaults to CHECK_ATTRIBUTES and
  // is set otherwise when docshells which are content boundaries are created.
-    enum FullscreenAllowedState {
+  enum FullscreenAllowedState
  {
    CHECK_ATTRIBUTES,
    PARENT_ALLOWS,
    PARENT_PROHIBITS
@@ -953,6 +962,7 @@ protected:
  nsString mPaymentRequestId;
  nsString GetInheritedPaymentRequestId();
 private:
  nsCString mForcedCharset;
  nsCString mParentCharset;
@@ -981,10 +991,11 @@ private:
  nsresult DoFindItemWithName(const char16_t* aName,
                              nsISupports* aRequestor,
                              nsIDocShellTreeItem* aOriginalRequestor,
-                                nsIDocShellTreeItem** _retval);
+                              nsIDocShellTreeItem** aResult);
  // Notify consumers of a search being loaded through the observer service:
-    void MaybeNotifyKeywordSearchLoading(const nsString &aProvider, const nsString &aKeyword);
+  void MaybeNotifyKeywordSearchLoading(const nsString& aProvider,
                                       const nsString& aKeyword);
 #ifdef DEBUG
  // We're counting the number of |nsDocShells| to help find leaks
@@ -992,9 +1003,10 @@ private:
 #endif /* DEBUG */
 public:
-    class InterfaceRequestorProxy : public nsIInterfaceRequestor {
+  class InterfaceRequestorProxy : public nsIInterfaceRequestor
  {
  public:
-        explicit InterfaceRequestorProxy(nsIInterfaceRequestor* p);
+    explicit InterfaceRequestorProxy(nsIInterfaceRequestor* aRequestor);
    NS_DECL_THREADSAFE_ISUPPORTS
    NS_DECL_NSIINTERFACEREQUESTOR
--- a/docshell/base/nsDocShellEditorData.cpp
+++ b/docshell/base/nsDocShellEditorData.cpp
@@ -4,7 +4,6 @@
 * 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/. */
 #include "nsDocShellEditorData.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsComponentManagerUtils.h"
@@ -14,14 +13,8 @@
 #include "nsIEditingSession.h"
 #include "nsIDocShell.h"
-/*---------------------------------------------------------------------------
+nsDocShellEditorData::nsDocShellEditorData(nsIDocShell* aOwningDocShell)
-
+  : mDocShell(aOwningDocShell)
  nsDocShellEditorData
 ----------------------------------------------------------------------------*/
 nsDocShellEditorData::nsDocShellEditorData(nsIDocShell* inOwningDocShell)
 : mDocShell(inOwningDocShell)
  , mMakeEditable(false)
  , mIsDetached(false)
  , mDetachedMakeEditable(false)
@@ -30,12 +23,6 @@ nsDocShellEditorData::nsDocShellEditorData(nsIDocShell* inOwningDocShell)
  NS_ASSERTION(mDocShell, "Where is my docShell?");
 }
 /*---------------------------------------------------------------------------
  ~nsDocShellEditorData
 ----------------------------------------------------------------------------*/
 nsDocShellEditorData::~nsDocShellEditorData()
 {
  TearDownEditor();
@@ -52,133 +39,94 @@ nsDocShellEditorData::TearDownEditor()
  mIsDetached = false;
 }
 /*---------------------------------------------------------------------------
  MakeEditable
 ----------------------------------------------------------------------------*/
 nsresult
-nsDocShellEditorData::MakeEditable(bool inWaitForUriLoad)
+nsDocShellEditorData::MakeEditable(bool aInWaitForUriLoad)
 {
-  if (mMakeEditable)
+  if (mMakeEditable) {
    return NS_OK;
  }
  // if we are already editable, and are getting turned off,
  // nuke the editor.
-  if (mEditor)
+  if (mEditor) {
  {
    NS_WARNING("Destroying existing editor on frame");
    mEditor->PreDestroy(false);
    mEditor = nullptr;
  }
-  if (inWaitForUriLoad)
+  if (aInWaitForUriLoad) {
    mMakeEditable = true;
  }
  return NS_OK;
 }
 /*---------------------------------------------------------------------------
  GetEditable
 ----------------------------------------------------------------------------*/
 bool
 nsDocShellEditorData::GetEditable()
 {
  return mMakeEditable || (mEditor != nullptr);
 }
 /*---------------------------------------------------------------------------
  CreateEditor
 ----------------------------------------------------------------------------*/
 nsresult
 nsDocShellEditorData::CreateEditor()
 {
  nsCOMPtr<nsIEditingSession> editingSession;
  nsresult rv = GetEditingSession(getter_AddRefs(editingSession));
-  if (NS_FAILED(rv)) return rv;
+  if (NS_FAILED(rv)) {
    return rv;
  }
  nsCOMPtr<nsIDOMWindow> domWindow =
    mDocShell ? mDocShell->GetWindow() : nullptr;
  rv = editingSession->SetupEditorOnWindow(domWindow);
-  if (NS_FAILED(rv)) return rv;
+  if (NS_FAILED(rv)) {
    return rv;
  }
  return NS_OK;
 }
 /*---------------------------------------------------------------------------
  GetEditingSession
 ----------------------------------------------------------------------------*/
 nsresult
-nsDocShellEditorData::GetEditingSession(nsIEditingSession **outEditingSession)
+nsDocShellEditorData::GetEditingSession(nsIEditingSession** aResult)
 {
  nsresult rv = EnsureEditingSession();
  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ADDREF(*outEditingSession = mEditingSession);
+  NS_ADDREF(*aResult = mEditingSession);
  return NS_OK;
 }
 /*---------------------------------------------------------------------------
  GetEditor
 ----------------------------------------------------------------------------*/
 nsresult
-nsDocShellEditorData::GetEditor(nsIEditor **outEditor)
+nsDocShellEditorData::GetEditor(nsIEditor** aResult)
 {
-  NS_ENSURE_ARG_POINTER(outEditor);
+  NS_ENSURE_ARG_POINTER(aResult);
-  NS_IF_ADDREF(*outEditor = mEditor);
+  NS_IF_ADDREF(*aResult = mEditor);
  return NS_OK;
 }
 /*---------------------------------------------------------------------------
  SetEditor
 ----------------------------------------------------------------------------*/
 nsresult
-nsDocShellEditorData::SetEditor(nsIEditor *inEditor)
+nsDocShellEditorData::SetEditor(nsIEditor* aEditor)
 {
  // destroy any editor that we have. Checks for equality are
  // necessary to ensure that assigment into the nsCOMPtr does
  // not temporarily reduce the refCount of the editor to zero
-  if (mEditor.get() != inEditor)
+  if (mEditor.get() != aEditor) {
-  {
+    if (mEditor) {
    if (mEditor)
    {
      mEditor->PreDestroy(false);
      mEditor = nullptr;
    }
-    mEditor = inEditor;    // owning addref
+    mEditor = aEditor;  // owning addref
-    if (!mEditor)
+    if (!mEditor) {
      mMakeEditable = false;
    }
  }
  return NS_OK;
 }
-
+// This creates the editing session on the content docShell that owns 'this'.
 /*---------------------------------------------------------------------------
  EnsureEditingSession
  This creates the editing session on the content docShell that owns
  'this'.
 ----------------------------------------------------------------------------*/
 nsresult
 nsDocShellEditorData::EnsureEditingSession()
 {
@@ -187,8 +135,7 @@ nsDocShellEditorData::EnsureEditingSession()
  nsresult rv = NS_OK;
-  if (!mEditingSession)
+  if (!mEditingSession) {
  {
    mEditingSession =
      do_CreateInstance("@mozilla.org/editor/editingsession;1", &rv);
  }
@@ -214,8 +161,9 @@ nsDocShellEditorData::DetachFromWindow()
  nsCOMPtr<nsIDOMDocument> domDoc;
  domWindow->GetDocument(getter_AddRefs(domDoc));
  nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(domDoc);
-  if (htmlDoc)
+  if (htmlDoc) {
    mDetachedEditingState = htmlDoc->GetEditingState();
  }
  mDocShell = nullptr;
@@ -238,8 +186,9 @@ nsDocShellEditorData::ReattachToWindow(nsIDocShell* aDocShell)
  nsCOMPtr<nsIDOMDocument> domDoc;
  domWindow->GetDocument(getter_AddRefs(domDoc));
  nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(domDoc);
-  if (htmlDoc)
+  if (htmlDoc) {
    htmlDoc->SetEditingState(mDetachedEditingState);
  }
  return NS_OK;
 }
--- a/docshell/base/nsDocShellEditorData.h
+++ b/docshell/base/nsDocShellEditorData.h
@@ -19,23 +19,21 @@ class nsIEditor;
 class nsDocShellEditorData
 {
 public:
-
+  explicit nsDocShellEditorData(nsIDocShell* aOwningDocShell);
  explicit nsDocShellEditorData(nsIDocShell* inOwningDocShell);
  ~nsDocShellEditorData();
-  nsresult MakeEditable(bool inWaitForUriLoad);
+  nsresult MakeEditable(bool aWaitForUriLoad);
  bool GetEditable();
  nsresult CreateEditor();
-  nsresult GetEditingSession(nsIEditingSession **outEditingSession);
+  nsresult GetEditingSession(nsIEditingSession** aResult);
-  nsresult GetEditor(nsIEditor **outEditor);
+  nsresult GetEditor(nsIEditor** aResult);
-  nsresult SetEditor(nsIEditor *inEditor);
+  nsresult SetEditor(nsIEditor* aEditor);
  void TearDownEditor();
  nsresult DetachFromWindow();
  nsresult ReattachToWindow(nsIDocShell* aDocShell);
  bool WaitingForLoad() const { return mMakeEditable; }
 protected:
  nsresult EnsureEditingSession();
  // The doc shell that owns us. Weak ref, since it always outlives us.
@@ -63,5 +61,4 @@ protected:
 };
 #endif // nsDocShellEditorData_h__
--- a/docshell/base/nsDocShellEnumerator.cpp
+++ b/docshell/base/nsDocShellEnumerator.cpp
@@ -4,17 +4,16 @@
 * 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/. */
 #include "nsDocShellEnumerator.h"
 #include "nsIDocShellTreeItem.h"
-nsDocShellEnumerator::nsDocShellEnumerator(int32_t inEnumerationDirection)
+nsDocShellEnumerator::nsDocShellEnumerator(int32_t aEnumerationDirection)
  : mRootItem(nullptr)
  , mCurIndex(0)
  , mDocShellType(nsIDocShellTreeItem::typeAll)
  , mArrayValid(false)
-, mEnumerationDirection(inEnumerationDirection)
+  , mEnumerationDirection(aEnumerationDirection)
 {
 }
@@ -24,15 +23,17 @@ nsDocShellEnumerator::~nsDocShellEnumerator()
 NS_IMPL_ISUPPORTS(nsDocShellEnumerator, nsISimpleEnumerator)
 /* nsISupports getNext (); */
-NS_IMETHODIMP nsDocShellEnumerator::GetNext(nsISupports **outCurItem)
+NS_IMETHODIMP
 nsDocShellEnumerator::GetNext(nsISupports** aResult)
 {
-  NS_ENSURE_ARG_POINTER(outCurItem);
+  NS_ENSURE_ARG_POINTER(aResult);
-  *outCurItem = nullptr;
+  *aResult = nullptr;
  nsresult rv = EnsureDocShellArray();
-  if (NS_FAILED(rv)) return rv;
+  if (NS_FAILED(rv)) {
    return rv;
  }
  if (mCurIndex >= mItemArray.Length()) {
    return NS_ERROR_FAILURE;
@@ -40,24 +41,29 @@ NS_IMETHODIMP nsDocShellEnumerator::GetNext(nsISupports **outCurItem)
  // post-increment is important here
  nsCOMPtr<nsISupports> item = do_QueryReferent(mItemArray[mCurIndex++], &rv);
-  item.forget(outCurItem);
+  item.forget(aResult);
  return rv;
 }
 /* boolean hasMoreElements (); */
-NS_IMETHODIMP nsDocShellEnumerator::HasMoreElements(bool *outHasMore)
+NS_IMETHODIMP
 nsDocShellEnumerator::HasMoreElements(bool* aResult)
 {
-  NS_ENSURE_ARG_POINTER(outHasMore);
+  NS_ENSURE_ARG_POINTER(aResult);
-  *outHasMore = false;
+  *aResult = false;
  nsresult rv = EnsureDocShellArray();
-  if (NS_FAILED(rv)) return rv;
+  if (NS_FAILED(rv)) {
    return rv;
  }
-  *outHasMore = (mCurIndex < mItemArray.Length());
+  *aResult = (mCurIndex < mItemArray.Length());
  return NS_OK;
 }
-nsresult nsDocShellEnumerator::GetEnumerationRootItem(nsIDocShellTreeItem * *aEnumerationRootItem)
+nsresult
 nsDocShellEnumerator::GetEnumerationRootItem(
    nsIDocShellTreeItem** aEnumerationRootItem)
 {
  NS_ENSURE_ARG_POINTER(aEnumerationRootItem);
  nsCOMPtr<nsIDocShellTreeItem> item = do_QueryReferent(mRootItem);
@@ -65,37 +71,42 @@ nsresult nsDocShellEnumerator::GetEnumerationRootItem(nsIDocShellTreeItem * *aEn
  return NS_OK;
 }
-nsresult nsDocShellEnumerator::SetEnumerationRootItem(nsIDocShellTreeItem * aEnumerationRootItem)
+nsresult
 nsDocShellEnumerator::SetEnumerationRootItem(
    nsIDocShellTreeItem* aEnumerationRootItem)
 {
  mRootItem = do_GetWeakReference(aEnumerationRootItem);
  ClearState();
  return NS_OK;
 }
-nsresult nsDocShellEnumerator::GetEnumDocShellType(int32_t *aEnumerationItemType)
+nsresult
 nsDocShellEnumerator::GetEnumDocShellType(int32_t* aEnumerationItemType)
 {
  NS_ENSURE_ARG_POINTER(aEnumerationItemType);
  *aEnumerationItemType = mDocShellType;
  return NS_OK;
 }
-nsresult nsDocShellEnumerator::SetEnumDocShellType(int32_t aEnumerationItemType)
+nsresult
 nsDocShellEnumerator::SetEnumDocShellType(int32_t aEnumerationItemType)
 {
  mDocShellType = aEnumerationItemType;
  ClearState();
  return NS_OK;
 }
-nsresult nsDocShellEnumerator::First()
+nsresult
 nsDocShellEnumerator::First()
 {
  mCurIndex = 0;
  return EnsureDocShellArray();
 }
-nsresult nsDocShellEnumerator::EnsureDocShellArray()
+nsresult
-{
+nsDocShellEnumerator::EnsureDocShellArray()
  if (!mArrayValid)
 {
  if (!mArrayValid) {
    mArrayValid = true;
    return BuildDocShellArray(mItemArray);
  }
@@ -103,7 +114,8 @@ nsresult nsDocShellEnumerator::EnsureDocShellArray()
  return NS_OK;
 }
-nsresult nsDocShellEnumerator::ClearState()
+nsresult
 nsDocShellEnumerator::ClearState()
 {
  mItemArray.Clear();
  mArrayValid = false;
@@ -111,67 +123,85 @@ nsresult nsDocShellEnumerator::ClearState()
  return NS_OK;
 }
-nsresult nsDocShellEnumerator::BuildDocShellArray(nsTArray<nsWeakPtr>& inItemArray)
+nsresult
 nsDocShellEnumerator::BuildDocShellArray(nsTArray<nsWeakPtr>& aItemArray)
 {
  NS_ENSURE_TRUE(mRootItem, NS_ERROR_NOT_INITIALIZED);
-  inItemArray.Clear();
+  aItemArray.Clear();
  nsCOMPtr<nsIDocShellTreeItem> item = do_QueryReferent(mRootItem);
-  return BuildArrayRecursive(item, inItemArray);
+  return BuildArrayRecursive(item, aItemArray);
 }
-nsresult nsDocShellForwardsEnumerator::BuildArrayRecursive(nsIDocShellTreeItem* inItem, nsTArray<nsWeakPtr>& inItemArray)
+nsresult
 nsDocShellForwardsEnumerator::BuildArrayRecursive(
    nsIDocShellTreeItem* aItem,
    nsTArray<nsWeakPtr>& aItemArray)
 {
  nsresult rv;
  // add this item to the array
  if (mDocShellType == nsIDocShellTreeItem::typeAll ||
-      inItem->ItemType() == mDocShellType) {
+      aItem->ItemType() == mDocShellType) {
-    if (!inItemArray.AppendElement(do_GetWeakReference(inItem)))
+    if (!aItemArray.AppendElement(do_GetWeakReference(aItem))) {
      return NS_ERROR_OUT_OF_MEMORY;
    }
  }
  int32_t numChildren;
-  rv = inItem->GetChildCount(&numChildren);
+  rv = aItem->GetChildCount(&numChildren);
-  if (NS_FAILED(rv)) return rv;
+  if (NS_FAILED(rv)) {
    return rv;
  }
-  for (int32_t i = 0; i < numChildren; ++i)
+  for (int32_t i = 0; i < numChildren; ++i) {
  {
    nsCOMPtr<nsIDocShellTreeItem> curChild;
-    rv = inItem->GetChildAt(i, getter_AddRefs(curChild));
+    rv = aItem->GetChildAt(i, getter_AddRefs(curChild));
-    if (NS_FAILED(rv)) return rv;
+    if (NS_FAILED(rv)) {
      return rv;
    }
-    rv = BuildArrayRecursive(curChild, inItemArray);
+    rv = BuildArrayRecursive(curChild, aItemArray);
-    if (NS_FAILED(rv)) return rv;
+    if (NS_FAILED(rv)) {
      return rv;
    }
  }
  return NS_OK;
 }
-
+nsresult
-nsresult nsDocShellBackwardsEnumerator::BuildArrayRecursive(nsIDocShellTreeItem* inItem, nsTArray<nsWeakPtr>& inItemArray)
+nsDocShellBackwardsEnumerator::BuildArrayRecursive(
    nsIDocShellTreeItem* aItem,
    nsTArray<nsWeakPtr>& aItemArray)
 {
  nsresult rv;
  int32_t numChildren;
-  rv = inItem->GetChildCount(&numChildren);
+  rv = aItem->GetChildCount(&numChildren);
-  if (NS_FAILED(rv)) return rv;
+  if (NS_FAILED(rv)) {
    return rv;
  }
-  for (int32_t i = numChildren - 1; i >= 0; --i)
+  for (int32_t i = numChildren - 1; i >= 0; --i) {
  {
    nsCOMPtr<nsIDocShellTreeItem> curChild;
-    rv = inItem->GetChildAt(i, getter_AddRefs(curChild));
+    rv = aItem->GetChildAt(i, getter_AddRefs(curChild));
-    if (NS_FAILED(rv)) return rv;
+    if (NS_FAILED(rv)) {
      return rv;
    }
-    rv = BuildArrayRecursive(curChild, inItemArray);
+    rv = BuildArrayRecursive(curChild, aItemArray);
-    if (NS_FAILED(rv)) return rv;
+    if (NS_FAILED(rv)) {
      return rv;
    }
  }
  // add this item to the array
  if (mDocShellType == nsIDocShellTreeItem::typeAll ||
-      inItem->ItemType() == mDocShellType) {
+      aItem->ItemType() == mDocShellType) {
-    if (!inItemArray.AppendElement(do_GetWeakReference(inItem)))
+    if (!aItemArray.AppendElement(do_GetWeakReference(aItem))) {
      return NS_ERROR_OUT_OF_MEMORY;
    }
  }
  return NS_OK;
 }
--- a/docshell/base/nsDocShellEnumerator.h
+++ b/docshell/base/nsDocShellEnumerator.h
@@ -32,8 +32,8 @@ class nsIDocShellTreeItem;
 class nsDocShellEnumerator : public nsISimpleEnumerator
 {
 protected:
-
+  enum
-  enum {
+  {
    enumerateForwards,
    enumerateBackwards
  };
@@ -41,8 +41,7 @@ protected:
  virtual ~nsDocShellEnumerator();
 public:
-
+  explicit nsDocShellEnumerator(int32_t aEnumerationDirection);
                              explicit nsDocShellEnumerator(int32_t inEnumerationDirection);
  // nsISupports
  NS_DECL_ISUPPORTS
@@ -51,7 +50,6 @@ public:
  NS_DECL_NSISIMPLEENUMERATOR
 public:
  nsresult GetEnumerationRootItem(nsIDocShellTreeItem** aEnumerationRootItem);
  nsresult SetEnumerationRootItem(nsIDocShellTreeItem* aEnumerationRootItem);
@@ -61,15 +59,14 @@ public:
  nsresult First();
 protected:
  nsresult EnsureDocShellArray();
  nsresult ClearState();
-  nsresult                    BuildDocShellArray(nsTArray<nsWeakPtr>& inItemArray);
+  nsresult BuildDocShellArray(nsTArray<nsWeakPtr>& aItemArray);
-  virtual nsresult            BuildArrayRecursive(nsIDocShellTreeItem* inItem, nsTArray<nsWeakPtr>& inItemArray) = 0;
+  virtual nsresult BuildArrayRecursive(nsIDocShellTreeItem* aItem,
                                       nsTArray<nsWeakPtr>& aItemArray) = 0;
 protected:
  nsWeakPtr mRootItem;  // weak ref!
  nsTArray<nsWeakPtr> mItemArray;  // flattened list of items with matching type
@@ -81,33 +78,31 @@ protected:
  const int8_t mEnumerationDirection;
 };
 class nsDocShellForwardsEnumerator : public nsDocShellEnumerator
 {
 public:
  nsDocShellForwardsEnumerator()
    : nsDocShellEnumerator(enumerateForwards)
  {
  }
 protected:
-
+  virtual nsresult BuildArrayRecursive(nsIDocShellTreeItem* aItem,
-  virtual nsresult            BuildArrayRecursive(nsIDocShellTreeItem* inItem, nsTArray<nsWeakPtr>& inItemArray);
+                                       nsTArray<nsWeakPtr>& aItemArray);
 };
 class nsDocShellBackwardsEnumerator : public nsDocShellEnumerator
 {
 public:
  nsDocShellBackwardsEnumerator()
    : nsDocShellEnumerator(enumerateBackwards)
  {
  }
 protected:
-  virtual nsresult            BuildArrayRecursive(nsIDocShellTreeItem* inItem, nsTArray<nsWeakPtr>& inItemArray);
+protected:
  virtual nsresult BuildArrayRecursive(nsIDocShellTreeItem* aItem,
                                       nsTArray<nsWeakPtr>& aItemArray);
 };
 #endif // nsDocShellEnumerator_h___
--- a/docshell/base/nsDocShellLoadInfo.cpp
+++ b/docshell/base/nsDocShellLoadInfo.cpp
@@ -17,12 +17,12 @@
 //*****************************************************************************
 nsDocShellLoadInfo::nsDocShellLoadInfo()
-  : mInheritOwner(false),
+  : mInheritOwner(false)
-    mOwnerIsExplicit(false),
+  , mOwnerIsExplicit(false)
-    mSendReferrer(true),
+  , mSendReferrer(true)
-    mReferrerPolicy(mozilla::net::RP_Default),
+  , mReferrerPolicy(mozilla::net::RP_Default)
-    mLoadType(nsIDocShellLoadInfo::loadNormal),
+  , mLoadType(nsIDocShellLoadInfo::loadNormal)
-    mIsSrcdocLoad(false)
+  , mIsSrcdocLoad(false)
 {
 }
@@ -46,7 +46,8 @@ NS_INTERFACE_MAP_END
 // nsDocShellLoadInfo::nsIDocShellLoadInfo
 //*****************************************************************************
-NS_IMETHODIMP nsDocShellLoadInfo::GetReferrer(nsIURI** aReferrer)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetReferrer(nsIURI** aReferrer)
 {
  NS_ENSURE_ARG_POINTER(aReferrer);
@@ -55,13 +56,15 @@ NS_IMETHODIMP nsDocShellLoadInfo::GetReferrer(nsIURI** aReferrer)
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetReferrer(nsIURI* aReferrer)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetReferrer(nsIURI* aReferrer)
 {
  mReferrer = aReferrer;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetOwner(nsISupports** aOwner)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetOwner(nsISupports** aOwner)
 {
  NS_ENSURE_ARG_POINTER(aOwner);
@@ -70,13 +73,15 @@ NS_IMETHODIMP nsDocShellLoadInfo::GetOwner(nsISupports** aOwner)
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetOwner(nsISupports* aOwner)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetOwner(nsISupports* aOwner)
 {
  mOwner = aOwner;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetInheritOwner(bool* aInheritOwner)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetInheritOwner(bool* aInheritOwner)
 {
  NS_ENSURE_ARG_POINTER(aInheritOwner);
@@ -84,25 +89,29 @@ NS_IMETHODIMP nsDocShellLoadInfo::GetInheritOwner(bool* aInheritOwner)
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetInheritOwner(bool aInheritOwner)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetInheritOwner(bool aInheritOwner)
 {
  mInheritOwner = aInheritOwner;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetOwnerIsExplicit(bool* aOwnerIsExplicit)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetOwnerIsExplicit(bool* aOwnerIsExplicit)
 {
  *aOwnerIsExplicit = mOwnerIsExplicit;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetOwnerIsExplicit(bool aOwnerIsExplicit)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetOwnerIsExplicit(bool aOwnerIsExplicit)
 {
  mOwnerIsExplicit = aOwnerIsExplicit;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetLoadType(nsDocShellInfoLoadType * aLoadType)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetLoadType(nsDocShellInfoLoadType* aLoadType)
 {
  NS_ENSURE_ARG_POINTER(aLoadType);
@@ -110,13 +119,15 @@ NS_IMETHODIMP nsDocShellLoadInfo::GetLoadType(nsDocShellInfoLoadType * aLoadType
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetLoadType(nsDocShellInfoLoadType aLoadType)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetLoadType(nsDocShellInfoLoadType aLoadType)
 {
  mLoadType = aLoadType;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetSHEntry(nsISHEntry** aSHEntry)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetSHEntry(nsISHEntry** aSHEntry)
 {
  NS_ENSURE_ARG_POINTER(aSHEntry);
@@ -125,13 +136,15 @@ NS_IMETHODIMP nsDocShellLoadInfo::GetSHEntry(nsISHEntry** aSHEntry)
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetSHEntry(nsISHEntry* aSHEntry)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetSHEntry(nsISHEntry* aSHEntry)
 {
  mSHEntry = aSHEntry;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetTarget(char16_t** aTarget)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetTarget(char16_t** aTarget)
 {
  NS_ENSURE_ARG_POINTER(aTarget);
@@ -140,13 +153,13 @@ NS_IMETHODIMP nsDocShellLoadInfo::GetTarget(char16_t** aTarget)
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetTarget(const char16_t* aTarget)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetTarget(const char16_t* aTarget)
 {
  mTarget.Assign(aTarget);
  return NS_OK;
 }
 NS_IMETHODIMP
 nsDocShellLoadInfo::GetPostDataStream(nsIInputStream** aResult)
 {
@@ -158,7 +171,6 @@ nsDocShellLoadInfo::GetPostDataStream(nsIInputStream **aResult)
  return NS_OK;
 }
 NS_IMETHODIMP
 nsDocShellLoadInfo::SetPostDataStream(nsIInputStream* aStream)
 {
@@ -167,20 +179,23 @@ nsDocShellLoadInfo::SetPostDataStream(nsIInputStream *aStream)
 }
 /* attribute nsIInputStream headersStream; */
-NS_IMETHODIMP nsDocShellLoadInfo::GetHeadersStream(nsIInputStream * *aHeadersStream)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetHeadersStream(nsIInputStream** aHeadersStream)
 {
  NS_ENSURE_ARG_POINTER(aHeadersStream);
  *aHeadersStream = mHeadersStream;
  NS_IF_ADDREF(*aHeadersStream);
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetHeadersStream(nsIInputStream * aHeadersStream)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetHeadersStream(nsIInputStream* aHeadersStream)
 {
  mHeadersStream = aHeadersStream;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetSendReferrer(bool* aSendReferrer)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetSendReferrer(bool* aSendReferrer)
 {
  NS_ENSURE_ARG_POINTER(aSendReferrer);
@@ -188,44 +203,53 @@ NS_IMETHODIMP nsDocShellLoadInfo::GetSendReferrer(bool* aSendReferrer)
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetSendReferrer(bool aSendReferrer)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetSendReferrer(bool aSendReferrer)
 {
  mSendReferrer = aSendReferrer;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetReferrerPolicy(nsDocShellInfoReferrerPolicy* aReferrerPolicy)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetReferrerPolicy(
    nsDocShellInfoReferrerPolicy* aReferrerPolicy)
 {
  *aReferrerPolicy = mReferrerPolicy;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetReferrerPolicy(nsDocShellInfoReferrerPolicy aReferrerPolicy)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetReferrerPolicy(
    nsDocShellInfoReferrerPolicy aReferrerPolicy)
 {
  mReferrerPolicy = aReferrerPolicy;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetIsSrcdocLoad(bool* aIsSrcdocLoad)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetIsSrcdocLoad(bool* aIsSrcdocLoad)
 {
  *aIsSrcdocLoad = mIsSrcdocLoad;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetSrcdocData(nsAString &aSrcdocData)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetSrcdocData(nsAString& aSrcdocData)
 {
  aSrcdocData = mSrcdocData;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetSrcdocData(const nsAString &aSrcdocData)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetSrcdocData(const nsAString& aSrcdocData)
 {
  mSrcdocData = aSrcdocData;
  mIsSrcdocLoad = true;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetSourceDocShell(nsIDocShell** aSourceDocShell)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetSourceDocShell(nsIDocShell** aSourceDocShell)
 {
  MOZ_ASSERT(aSourceDocShell);
  nsCOMPtr<nsIDocShell> result = mSourceDocShell;
@@ -233,13 +257,15 @@ NS_IMETHODIMP nsDocShellLoadInfo::GetSourceDocShell(nsIDocShell** aSourceDocShel
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetSourceDocShell(nsIDocShell* aSourceDocShell)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetSourceDocShell(nsIDocShell* aSourceDocShell)
 {
  mSourceDocShell = aSourceDocShell;
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::GetBaseURI(nsIURI** aBaseURI)
+NS_IMETHODIMP
 nsDocShellLoadInfo::GetBaseURI(nsIURI** aBaseURI)
 {
  NS_ENSURE_ARG_POINTER(aBaseURI);
@@ -248,16 +274,9 @@ NS_IMETHODIMP nsDocShellLoadInfo::GetBaseURI(nsIURI** aBaseURI)
  return NS_OK;
 }
-NS_IMETHODIMP nsDocShellLoadInfo::SetBaseURI(nsIURI* aBaseURI)
+NS_IMETHODIMP
 nsDocShellLoadInfo::SetBaseURI(nsIURI* aBaseURI)
 {
  mBaseURI = aBaseURI;
  return NS_OK;
 }
 //*****************************************************************************
 // nsDocShellLoadInfo: Helpers
 //*****************************************************************************   
 //*****************************************************************************
 // nsDocShellLoadInfo: Accessors
 //*****************************************************************************   
--- a/docshell/base/nsDocShellLoadInfo.h
+++ b/docshell/base/nsDocShellLoadInfo.h
@@ -7,7 +7,6 @@
 #ifndef nsDocShellLoadInfo_h__
 #define nsDocShellLoadInfo_h__
 // Helper Classes
 #include "nsCOMPtr.h"
 #include "nsString.h"
--- a/docshell/base/nsDocShellLoadTypes.h
+++ b/docshell/base/nsDocShellLoadTypes.h
@@ -32,15 +32,14 @@
                          LOAD_FLAGS_ALLOW_POPUPS            | \
                          0xffff0000)
 /* load types are legal combinations of load commands and flags
 *
 * NOTE:
 *  Remember to update the IsValidLoadType function below if you change this
 *  enum to ensure bad flag combinations will be rejected.
 */
-enum LoadType {
+enum LoadType
 {
  LOAD_NORMAL = MAKE_LOAD_TYPE(nsIDocShell::LOAD_CMD_NORMAL, nsIWebNavigation::LOAD_FLAGS_NONE),
  LOAD_NORMAL_REPLACE = MAKE_LOAD_TYPE(nsIDocShell::LOAD_CMD_NORMAL, nsIWebNavigation::LOAD_FLAGS_REPLACE_HISTORY),
  LOAD_NORMAL_EXTERNAL = MAKE_LOAD_TYPE(nsIDocShell::LOAD_CMD_NORMAL, nsIWebNavigation::LOAD_FLAGS_FROM_EXTERNAL),
@@ -71,10 +70,10 @@ enum LoadType {
  // NOTE: Adding a new value? Remember to update IsValidLoadType!
 };
-static inline bool IsValidLoadType(uint32_t aLoadType)
+static inline bool
-{
+IsValidLoadType(uint32_t aLoadType)
    switch (aLoadType)
 {
  switch (aLoadType) {
    case LOAD_NORMAL:
    case LOAD_NORMAL_REPLACE:
    case LOAD_NORMAL_EXTERNAL:
--- a/docshell/base/nsDocShellTransferableHooks.cpp
+++ b/docshell/base/nsDocShellTransferableHooks.cpp
@@ -11,7 +11,6 @@ nsTransferableHookData::nsTransferableHookData()
 {
 }
 nsTransferableHookData::~nsTransferableHookData()
 {
 }
@@ -29,11 +28,11 @@ nsTransferableHookData::AddClipboardDragDropHooks(
  NS_ENSURE_ARG(aOverrides);
  // don't let a hook be added more than once
-    if (mHookList.IndexOfObject(aOverrides) == -1)
+  if (mHookList.IndexOfObject(aOverrides) == -1) {
-    {
+    if (!mHookList.AppendObject(aOverrides)) {
        if (!mHookList.AppendObject(aOverrides))
      return NS_ERROR_FAILURE;
    }
  }
  return NS_OK;
 }
@@ -43,8 +42,9 @@ nsTransferableHookData::RemoveClipboardDragDropHooks(
    nsIClipboardDragDropHooks* aOverrides)
 {
  NS_ENSURE_ARG(aOverrides);
-    if (!mHookList.RemoveObject(aOverrides))
+  if (!mHookList.RemoveObject(aOverrides)) {
    return NS_ERROR_FAILURE;
  }
  return NS_OK;
 }
--- a/docshell/base/nsDownloadHistory.cpp
+++ b/docshell/base/nsDownloadHistory.cpp
@@ -29,8 +29,9 @@ nsDownloadHistory::AddDownload(nsIURI *aSource,
  nsCOMPtr<nsIGlobalHistory2> history =
    do_GetService("@mozilla.org/browser/global-history;2");
-  if (!history)
+  if (!history) {
    return NS_ERROR_NOT_AVAILABLE;
  }
  bool visited;
  nsresult rv = history->IsVisited(aSource, &visited);
@@ -42,9 +43,10 @@ nsDownloadHistory::AddDownload(nsIURI *aSource,
  if (!visited) {
    nsCOMPtr<nsIObserverService> os =
      do_GetService("@mozilla.org/observer-service;1");
-    if (os)
+    if (os) {
      os->NotifyObservers(aSource, NS_LINK_VISITED_EVENT_TOPIC, nullptr);
    }
  }
  return NS_OK;
 }
--- a/docshell/base/nsILinkHandler.h
+++ b/docshell/base/nsILinkHandler.h
@@ -22,7 +22,8 @@ class nsString;
 /**
 * Interface used for handling clicks on links
 */
-class nsILinkHandler : public nsISupports {
+class nsILinkHandler : public nsISupports
 {
 public:
  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ILINKHANDLER_IID)
--- a/docshell/base/nsIScrollObserver.h
+++ b/docshell/base/nsIScrollObserver.h
@@ -27,13 +27,13 @@ public:
   * Called when an async panning/zooming transform has started being applied
   * and passed the scroll offset
   */
-  virtual void AsyncPanZoomStarted(const mozilla::CSSIntPoint scrollPos){};
+  virtual void AsyncPanZoomStarted(const mozilla::CSSIntPoint aScrollPos) {};
  /**
   * Called when an async panning/zooming transform is no longer applied
   * and passed the scroll offset
   */
-  virtual void AsyncPanZoomStopped(const mozilla::CSSIntPoint scrollPos){};
+  virtual void AsyncPanZoomStopped(const mozilla::CSSIntPoint aScrollPos) {};
 };
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIScrollObserver, NS_ISCROLLOBSERVER_IID)
--- a/docshell/base/nsIWebShellServices.h
+++ b/docshell/base/nsIWebShellServices.h
@@ -16,7 +16,8 @@
 //----------------------------------------------------------------------
-class nsIWebShellServices : public nsISupports {
+class nsIWebShellServices : public nsISupports
 {
 public:
  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IWEB_SHELL_SERVICES_IID)
@@ -29,7 +30,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIWebShellServices, NS_IWEB_SHELL_SERVICES_IID)
 /* Use this macro when declaring classes that implement this interface. */
 #define NS_DECL_NSIWEBSHELLSERVICES \
-  NS_IMETHOD ReloadDocument(const char *aCharset=nullptr, int32_t aSource=kCharsetUninitialized) MOZ_OVERRIDE; \
+  NS_IMETHOD ReloadDocument(const char* aCharset = nullptr, \
-  NS_IMETHOD StopDocumentLoad(void) MOZ_OVERRIDE; \
+                            int32_t aSource = kCharsetUninitialized) MOZ_OVERRIDE; \
  NS_IMETHOD StopDocumentLoad(void) MOZ_OVERRIDE;
 #endif /* nsIWebShellServices_h___ */
--- a/docshell/base/nsWebNavigationInfo.cpp
+++ b/docshell/base/nsWebNavigationInfo.cpp
@@ -55,7 +55,8 @@ nsWebNavigationInfo::IsTypeSupported(const nsACString& aType,
  // there's no need to try and find a plugin to handle it.
  nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(aWebNav));
  bool allowed;
-  if (docShell && NS_SUCCEEDED(docShell->GetAllowPlugins(&allowed)) && !allowed) {
+  if (docShell &&
      NS_SUCCEEDED(docShell->GetAllowPlugins(&allowed)) && !allowed) {
    return NS_OK;
  }
@@ -84,7 +85,6 @@ nsWebNavigationInfo::IsTypeSupportedInternal(const nsCString& aType,
 {
  NS_PRECONDITION(aIsSupported, "Null out param?");
  nsContentUtils::ContentViewerType vtype = nsContentUtils::TYPE_UNSUPPORTED;
  nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
@@ -109,8 +109,7 @@ nsWebNavigationInfo::IsTypeSupportedInternal(const nsCString& aType,
      // contractid.
      if (imgLoader::SupportImageWithMimeType(aType.get())) {
        *aIsSupported = nsIWebNavigationInfo::IMAGE;
-    }
+      } else {
    else {
        *aIsSupported = nsIWebNavigationInfo::OTHER;
      }
      break;