Bindings: Manage the main world separately from other worlds

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

Index: third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorldTest.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorldTest.cpp b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorldTest.cpp
index 1dc4a3639c3825a7516a35d9974e7286b4f46c44..1d7263738a6d9ebb0c57a92687471b47ec1d64d2 100644
--- a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorldTest.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorldTest.cpp
@@ -83,16 +83,11 @@ void workerThreadFunc(WorkerBackingThread* thread,
 }
 
 TEST(DOMWrapperWorldTest, Basic) {
-  // Initially, there should be no worlds.
-  EXPECT_FALSE(DOMWrapperWorld::nonMainWorldsExistInMainThread());
-  Vector<RefPtr<DOMWrapperWorld>> retrievedWorlds;
-  DOMWrapperWorld::allWorldsInCurrentThread(retrievedWorlds);
-  EXPECT_TRUE(retrievedWorlds.isEmpty());
-
   // Create the main world and verify it.
   DOMWrapperWorld& mainWorld = DOMWrapperWorld::mainWorld();
   EXPECT_TRUE(mainWorld.isMainWorld());
   EXPECT_FALSE(DOMWrapperWorld::nonMainWorldsExistInMainThread());
+  Vector<RefPtr<DOMWrapperWorld>> retrievedWorlds;
   DOMWrapperWorld::allWorldsInCurrentThread(retrievedWorlds);
   EXPECT_EQ(1u, retrievedWorlds.size());
   EXPECT_TRUE(retrievedWorlds[0]->isMainWorld());