Simplify starting a navigation

third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

Index: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
index 9e12e0e2984f020b042b14d40f9c484010da9254..bc5e3c2bbeaf489e66366c95cf1dcc0a3b79e5d3 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
@@ -96,8 +96,8 @@ protected:
     {
         dummyPageHolder = DummyPageHolder::create(IntSize(500, 500));
         dummyPageHolder->page().setDeviceScaleFactor(1.0);
-        documentLoader = DocumentLoader::create(&dummyPageHolder->frame(), ResourceRequest("http://www.example.com"), SubstituteData());
         document = toHTMLDocument(&dummyPageHolder->document());
+        documentLoader = document->loader();
         fetchContext = static_cast<FrameFetchContext*>(&documentLoader->fetcher()->context());
         owner = StubFrameOwner::create();
         FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
@@ -105,11 +105,9 @@ protected:
 
     void TearDown() override
     {
-        documentLoader->detachFromFrame();

[Nate Chapin, 2015/11/04 22:13:09]

I'm not sure exactly which change I made caused this to try to double-detach and
crash, but I'm surprised it wasn't broken before :)

[jochen (gone - plz use gerrit), 2015/11/06 05:28:05]

well, you're no longer creating documentLoader just for the test but use the one
from the document.

         documentLoader.clear();
 
         if (childFrame) {
-            childDocumentLoader->detachFromFrame();
             childDocumentLoader.clear();
             childFrame->detach(FrameDetachType::Remove);
         }
@@ -121,8 +119,8 @@ protected:
         childFrame = LocalFrame::create(childClient.get(), document->frame()->host(), owner.get());
         childFrame->setView(FrameView::create(childFrame.get(), IntSize(500, 500)));
         childFrame->init();
-        childDocumentLoader = DocumentLoader::create(childFrame.get(), ResourceRequest("http://www.example.com"), SubstituteData());
         childDocument = childFrame->document();
+        childDocumentLoader = childDocument->loader();
         FrameFetchContext* childFetchContext = static_cast<FrameFetchContext*>(&childDocumentLoader->fetcher()->context());
         FrameFetchContext::provideDocumentToContext(*childFetchContext, childDocument.get());
         return childFetchContext;