Replace ASSERT*() with DCHECK*() in core/fetch/ and core/loader/

third_party/WebKit/Source/core/loader/HttpEquiv.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/loader/HttpEquiv.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ScriptableDocumentParser.h"
 #include "core/dom/StyleEngine.h"
 #include "core/fetch/ClientHintsPreferences.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/origin_trials/OriginTrialContext.h"
 #include "platform/HTTPNames.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/weborigin/KURL.h"
 
 namespace blink {
 
 void HttpEquiv::process(Document& document, const AtomicString& equiv, const AtomicString& content, bool inDocumentHeadElement)
 {
-    ASSERT(!equiv.isNull() && !content.isNull());
+    DCHECK(!equiv.isNull() && !content.isNull());

[yhirano, 2016/09/12 04:33:13]

How about having two DCHECKs?

[hiroshige, 2016/09/13 08:43:21]

Done.

 
     if (equalIgnoringCase(equiv, "default-style")) {
         processHttpEquivDefaultStyle(document, content);
     } else if (equalIgnoringCase(equiv, "refresh")) {
         processHttpEquivRefresh(document, content);
     } else if (equalIgnoringCase(equiv, "set-cookie")) {
         processHttpEquivSetCookie(document, content);
     } else if (equalIgnoringCase(equiv, "content-language")) {
         document.setContentLanguage(content);
     } else if (equalIgnoringCase(equiv, "x-dns-prefetch-control")) {
@@ skipping 17 matching lines @@
 
 void HttpEquiv::processHttpEquivContentSecurityPolicy(Document& document, const AtomicString& equiv, const AtomicString& content)
 {
     if (document.importLoader())
         return;
     if (equalIgnoringCase(equiv, "content-security-policy"))
         document.contentSecurityPolicy()->didReceiveHeader(content, ContentSecurityPolicyHeaderTypeEnforce, ContentSecurityPolicyHeaderSourceMeta);
     else if (equalIgnoringCase(equiv, "content-security-policy-report-only"))
         document.contentSecurityPolicy()->didReceiveHeader(content, ContentSecurityPolicyHeaderTypeReport, ContentSecurityPolicyHeaderSourceMeta);
     else
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
 }
 
 void HttpEquiv::processHttpEquivAcceptCH(Document& document, const AtomicString& content)
 {
     if (!document.frame())
         return;
 
     UseCounter::count(document, UseCounter::ClientHintsMetaAcceptCH);
     document.clientHintsPreferences().updateFromAcceptClientHintsHeader(content, document.fetcher());
 }
@@ skipping 20 matching lines @@
 
     UseCounter::count(document, UseCounter::MetaSetCookie);
     if (!document.contentSecurityPolicy()->allowInlineScript(KURL(), "", OrdinalNumber(), "", ContentSecurityPolicy::SuppressReport))
         UseCounter::count(document, UseCounter::MetaSetCookieWhenCSPBlocksInlineScript);
 
     // Exception (for sandboxed documents) ignored.
     document.setCookie(content, IGNORE_EXCEPTION);
 }
 
 } // namespace blink