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

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

 /*
  * 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 21 matching lines @@
 #define DOMWrapperWorld_h
 
 #include <memory>
 
 #include "platform/PlatformExport.h"
 #include "platform/bindings/ScriptState.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/wtf/PassRefPtr.h"
 #include "platform/wtf/RefCounted.h"
 #include "platform/wtf/RefPtr.h"
+#include "public/platform/WebIsolatedWorldIds.h"
 #include "v8/include/v8.h"
 
 namespace blink {
 
 class DOMDataStore;
 class DOMObjectHolderBase;
 
 // This class represent a collection of DOM wrappers for a specific world. This
 // is identified by a world id that is a per-thread global identifier (see
 // WorldId enum).
 class PLATFORM_EXPORT DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
  public:
   // Per-thread global identifiers for DOMWrapperWorld.
   enum WorldId {
     kInvalidWorldId = -1,
     kMainWorldId = 0,
 
-    // Embedder isolated worlds can use IDs in [1, 1<<29).
-    kEmbedderWorldIdLimit = (1 << 29),
-    kDocumentXMLTreeViewerWorldId,
-    kDevToolsFirstIsolatedWorldId,
-    kDevToolsLastIsolatedWorldId = kDevToolsFirstIsolatedWorldId + 100,
-    kIsolatedWorldIdLimit,
+    kEmbedderWorldIdLimit = IsolatedWorldId::kEmbedderWorldIdLimit,
+    kIsolatedWorldIdLimit = IsolatedWorldId::kIsolatedWorldIdLimit,
 
     // Other worlds can use IDs after this. Don't manually pick up an ID from
     // this range. generateWorldIdForType() picks it up on behalf of you.
     kUnspecifiedWorldIdStart,
   };
 
   enum class WorldType {
     kMain,
     kIsolated,
     kInspectorIsolated,
@@ skipping 150 matching lines @@
 
   const WorldType world_type_;
   const int world_id_;
   std::unique_ptr<DOMDataStore> dom_data_store_;
   HashSet<std::unique_ptr<DOMObjectHolderBase>> dom_object_holders_;
 };
 
 }  // namespace blink
 
 #endif  // DOMWrapperWorld_h