[Reland] Allow headless TabSocket in isolated worlds & remove obsolete logic

third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.cpp

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 259 matching lines @@
     case WorldType::kMain:
       return kMainWorldId;
     case WorldType::kIsolated:
       // This function should not be called for IsolatedWorld because an
       // identifier for the world is given from out of DOMWrapperWorld.
       NOTREACHED();
       return kInvalidWorldId;
     case WorldType::kInspectorIsolated: {
       DCHECK(IsMainThread());
       static int next_devtools_isolated_world_id =
-          WorldId::kDevToolsFirstIsolatedWorldId;
+          IsolatedWorldId::kDevToolsFirstIsolatedWorldId;
       if (next_devtools_isolated_world_id >
-          WorldId::kDevToolsLastIsolatedWorldId)
+          IsolatedWorldId::kDevToolsLastIsolatedWorldId)
         return WorldId::kInvalidWorldId;
       return next_devtools_isolated_world_id++;
     }
     case WorldType::kGarbageCollector:
     case WorldType::kRegExp:
     case WorldType::kTesting:
     case WorldType::kWorker:
       int world_id = *next_world_id;
       CHECK_GE(world_id, WorldId::kUnspecifiedWorldIdStart);
       *next_world_id = world_id + 1;
       return world_id;
   }
   NOTREACHED();
   return kInvalidWorldId;
 }
 
 void DOMWrapperWorld::DissociateDOMWindowWrappersInAllWorlds(
     ScriptWrappable* script_wrappable) {
   DCHECK(script_wrappable);
   DCHECK(IsMainThread());
 
   script_wrappable->UnsetWrapperIfAny();
 
   for (auto& world : GetWorldMap().Values())
     world->DomDataStore().UnsetWrapperIfAny(script_wrappable);
 }
 
 }  // namespace blink