Mechanical style fixes: History.cpp and Location.cpp

third_party/WebKit/Source/core/frame/History.cpp

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 66 matching lines @@
   if (!frame())
     return 0;
 
   if (HistoryItem* historyItem = frame()->loader().currentItem())
     return historyItem->stateObject();
 
   return 0;
 }
 
 void History::setScrollRestoration(const String& value) {
-  ASSERT(value == "manual" || value == "auto");
+  DCHECK(value == "manual" || value == "auto");
   if (!frame() || !frame()->loader().client())
     return;
 
   HistoryScrollRestorationType scrollRestoration =
       value == "manual" ? ScrollRestorationManual : ScrollRestorationAuto;
   if (scrollRestoration == scrollRestorationInternal())
     return;
 
   if (HistoryItem* historyItem = frame()->loader().currentItem()) {
     historyItem->setScrollRestorationType(scrollRestoration);
@@ skipping 28 matching lines @@
 }
 
 void History::forward(ExecutionContext* context) {
   go(context, 1);
 }
 
 void History::go(ExecutionContext* context, int delta) {
   if (!frame() || !frame()->loader().client())
     return;
 
-  ASSERT(isMainThread());
+  DCHECK(isMainThread());
   Document* activeDocument = toDocument(context);
   if (!activeDocument)
     return;
 
   if (!activeDocument->frame() ||
-      !activeDocument->frame()->canNavigate(*frame()))
+      !activeDocument->frame()->canNavigate(*frame())) {
     return;
+  }
   if (!NavigationDisablerForUnload::isNavigationAllowed())
     return;
 
   // We intentionally call reload() for the current frame if delta is zero.
   // Otherwise, navigation happens on the root frame.
   // This behavior is designed in the following spec.
   // https://html.spec.whatwg.org/multipage/browsers.html#dom-history-go
   if (delta)
     frame()->loader().client()->navigateBackForward(delta);
   else
@@ skipping 24 matching lines @@
   // 'pushState'/'replaceState' to modify the URL fragment: see
   // https://crbug.com/528681 for the compatibility concerns.
   if (documentOrigin->isUnique() || documentOrigin->isLocal())
     return equalIgnoringQueryAndFragment(url, documentURL);
 
   if (!equalIgnoringPathQueryAndFragment(url, documentURL))
     return false;
 
   RefPtr<SecurityOrigin> requestedOrigin = SecurityOrigin::create(url);
   if (requestedOrigin->isUnique() ||
-      !requestedOrigin->isSameSchemeHostPort(documentOrigin))
+      !requestedOrigin->isSameSchemeHostPort(documentOrigin)) {
     return false;
+  }
 
   return true;
 }
 
 void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data,
                                const String& /* title */,
                                const String& urlString,
                                HistoryScrollRestorationType restorationType,
                                FrameLoadType type,
                                ExceptionState& exceptionState) {
@@ skipping 13 matching lines @@
         frame()->document()->url().elidedString() + "'.");
     return;
   }
 
   frame()->loader().updateForSameDocumentNavigation(
       fullURL, SameDocumentNavigationHistoryApi, std::move(data),
       restorationType, type, frame()->document());
 }
 
 }  // namespace blink