Replace ASSERT, RELEASE_ASSERT, and ASSERT_NOT_REACHED in bindings

third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp

Index: third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
index 6b3587097e367bdc09a40e466c908effd118d893..19a27ddeeece032941ad09ec34f3b4a53a45fe85 100644
--- a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
@@ -135,7 +135,7 @@ DOMWrapperWorld::DOMWrapperWorld(v8::Isolate* isolate,
 }
 
 DOMWrapperWorld& DOMWrapperWorld::MainWorld() {
-  ASSERT(IsMainThread());
+  DCHECK(IsMainThread());
   DEFINE_STATIC_REF(
       DOMWrapperWorld, cached_main_world,
       (DOMWrapperWorld::Create(v8::Isolate::GetCurrent(), WorldType::kMain)));
@@ -167,7 +167,7 @@ void DOMWrapperWorld::MarkWrappersInAllWorlds(
 }
 
 DOMWrapperWorld::~DOMWrapperWorld() {
-  ASSERT(!IsMainWorld());
+  DCHECK(!IsMainWorld());
   if (IsMainThread())
     number_of_non_main_worlds_in_main_thread_--;
 
@@ -187,7 +187,7 @@ void DOMWrapperWorld::Dispose() {
 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::EnsureIsolatedWorld(
     v8::Isolate* isolate,
     int world_id) {
-  ASSERT(IsIsolatedWorldId(world_id));
+  DCHECK(IsIsolatedWorldId(world_id));

[bhagirathi.s, 2017/04/13 14:04:39]

This is failed to compile in build bot, since IsIsolatedWorldId() is defined
under flag DCHECK_IS_ON() and DCHECK_IS_ON() is '0' in case of release build.
Shall I add DCHECK(IsIsolatedWorldId(world_id)) under flag DCHECK_IS_ON() like
below. Please suggest.

#if DCHECK_IS_ON()
DCHECK(IsIsolatedWorldId(world_id));
#endif

[tkent, 2017/04/14 00:26:44]

Yes, it's a straight-forward fix for this kind of issue.


Another solution would be to define IsIsolatedWorldId() in !DCHECK_IS_ON() too. 
e.g.

static bool IsIsolatedWorldId(int world_id) {
#if DCHECK_IS_ON()
  return DOMWrapperWorld::kMainWorldId < world_id &&
         world_id < DOMWrapperWorld::kIsolatedWorldIdLimit;
#else
  NOTREACHED() << "This function should be used only in DCHECK.";
  return true;
#endif
}

[bhagirathi.s, 2017/04/17 09:13:42]

DCHECK_IS_ON() added to fix the compilation error.

 
   WorldMap& map = GetWorldMap();
   auto it = map.Find(world_id);
@@ -203,13 +203,13 @@ PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::EnsureIsolatedWorld(
 
 typedef HashMap<int, RefPtr<SecurityOrigin>> IsolatedWorldSecurityOriginMap;
 static IsolatedWorldSecurityOriginMap& IsolatedWorldSecurityOrigins() {
-  ASSERT(IsMainThread());
+  DCHECK(IsMainThread());
   DEFINE_STATIC_LOCAL(IsolatedWorldSecurityOriginMap, map, ());
   return map;
 }
 
 SecurityOrigin* DOMWrapperWorld::IsolatedWorldSecurityOrigin() {
-  ASSERT(this->IsIsolatedWorld());
+  DCHECK(this->IsIsolatedWorld());
   IsolatedWorldSecurityOriginMap& origins = IsolatedWorldSecurityOrigins();
   IsolatedWorldSecurityOriginMap::iterator it = origins.Find(GetWorldId());
   return it == origins.end() ? 0 : it->value.Get();
@@ -218,7 +218,7 @@ SecurityOrigin* DOMWrapperWorld::IsolatedWorldSecurityOrigin() {
 void DOMWrapperWorld::SetIsolatedWorldSecurityOrigin(
     int world_id,
     PassRefPtr<SecurityOrigin> security_origin) {
-  ASSERT(IsIsolatedWorldId(world_id));
+  DCHECK(IsIsolatedWorldId(world_id));
   if (security_origin)
     IsolatedWorldSecurityOrigins().Set(world_id, std::move(security_origin));
   else
@@ -227,7 +227,7 @@ void DOMWrapperWorld::SetIsolatedWorldSecurityOrigin(
 
 typedef HashMap<int, String> IsolatedWorldHumanReadableNameMap;
 static IsolatedWorldHumanReadableNameMap& IsolatedWorldHumanReadableNames() {
-  ASSERT(IsMainThread());
+  DCHECK(IsMainThread());
   DEFINE_STATIC_LOCAL(IsolatedWorldHumanReadableNameMap, map, ());
   return map;
 }
@@ -240,20 +240,20 @@ String DOMWrapperWorld::IsolatedWorldHumanReadableName() {
 void DOMWrapperWorld::SetIsolatedWorldHumanReadableName(
     int world_id,
     const String& human_readable_name) {
-  ASSERT(IsIsolatedWorldId(world_id));
+  DCHECK(IsIsolatedWorldId(world_id));
   IsolatedWorldHumanReadableNames().Set(world_id, human_readable_name);
 }
 
 typedef HashMap<int, bool> IsolatedWorldContentSecurityPolicyMap;
 static IsolatedWorldContentSecurityPolicyMap&
 IsolatedWorldContentSecurityPolicies() {
-  ASSERT(IsMainThread());
+  DCHECK(IsMainThread());
   DEFINE_STATIC_LOCAL(IsolatedWorldContentSecurityPolicyMap, map, ());
   return map;
 }
 
 bool DOMWrapperWorld::IsolatedWorldHasContentSecurityPolicy() {
-  ASSERT(this->IsIsolatedWorld());
+  DCHECK(this->IsIsolatedWorld());
   IsolatedWorldContentSecurityPolicyMap& policies =
       IsolatedWorldContentSecurityPolicies();
   IsolatedWorldContentSecurityPolicyMap::iterator it =
@@ -264,7 +264,7 @@ bool DOMWrapperWorld::IsolatedWorldHasContentSecurityPolicy() {
 void DOMWrapperWorld::SetIsolatedWorldContentSecurityPolicy(
     int world_id,
     const String& policy) {
-  ASSERT(IsIsolatedWorldId(world_id));
+  DCHECK(IsIsolatedWorldId(world_id));
   if (!policy.IsEmpty())
     IsolatedWorldContentSecurityPolicies().Set(world_id, true);
   else
@@ -285,7 +285,7 @@ template void DOMWrapperWorld::RegisterDOMObjectHolder(v8::Isolate*,
 
 void DOMWrapperWorld::RegisterDOMObjectHolderInternal(
     std::unique_ptr<DOMObjectHolderBase> holder_base) {
-  ASSERT(!dom_object_holders_.Contains(holder_base.get()));
+  DCHECK(!dom_object_holders_.Contains(holder_base.get()));
   holder_base->SetWorld(this);
   holder_base->SetWeak(&DOMWrapperWorld::WeakCallbackForDOMObjectHolder);
   dom_object_holders_.insert(std::move(holder_base));
@@ -293,7 +293,7 @@ void DOMWrapperWorld::RegisterDOMObjectHolderInternal(
 
 void DOMWrapperWorld::UnregisterDOMObjectHolder(
     DOMObjectHolderBase* holder_base) {
-  ASSERT(dom_object_holders_.Contains(holder_base));
+  DCHECK(dom_object_holders_.Contains(holder_base));
   dom_object_holders_.erase(holder_base);
 }