Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(981)

Unified Diff: third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp

Issue 2846303002: Replace ASSERT with DCHECK in platform/ (Closed)
Patch Set: rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
index fa70965ee18c4993ae4226e3655c94be4ed3e193..af5abf1f59c110153e9a5e4cc0eea1cb5a8096c1 100644
--- a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
+++ b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
@@ -193,7 +193,7 @@ PassRefPtr<SecurityOrigin> SecurityOrigin::Create(const KURL& url) {
PassRefPtr<SecurityOrigin> SecurityOrigin::CreateUnique() {
RefPtr<SecurityOrigin> origin = AdoptRef(new SecurityOrigin());
- ASSERT(origin->IsUnique());
+ DCHECK(origin->IsUnique());
return origin.Release();
}
@@ -369,7 +369,7 @@ void SecurityOrigin::GrantUniversalAccess() {
}
void SecurityOrigin::AddSuborigin(const Suborigin& suborigin) {
- ASSERT(RuntimeEnabledFeatures::suboriginsEnabled());
+ DCHECK(RuntimeEnabledFeatures::suboriginsEnabled());
// Changing suborigins midstream is bad. Very bad. It should not happen.
// This is, in fact, one of the very basic invariants that makes
// suborigins an effective security tool.
@@ -379,7 +379,7 @@ void SecurityOrigin::AddSuborigin(const Suborigin& suborigin) {
}
void SecurityOrigin::BlockLocalAccessFromLocalOrigin() {
- ASSERT(IsLocal());
+ DCHECK(IsLocal());
block_local_access_from_local_origin_ = true;
}
@@ -575,7 +575,7 @@ bool SecurityOrigin::AreSameSchemeHostPort(const KURL& a, const KURL& b) {
}
const KURL& SecurityOrigin::UrlWithUniqueSecurityOrigin() {
- ASSERT(IsMainThread());
+ DCHECK(IsMainThread());
DEFINE_STATIC_LOCAL(const KURL, unique_security_origin_url,
(kParsedURLString, "data:,"));
return unique_security_origin_url;

Powered by Google App Engine
This is Rietveld 408576698