RemoteBridgeFrameOwner: keep better track of the attached frame

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

 /*
  * Copyright (c) 2015, 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 54 matching lines @@
 
 private:
     explicit StubFrameLoaderClientWithParent(Frame* parent)
         : m_parent(parent)
     {
     }
 
     RawPtrWillBeMember<Frame> m_parent;
 };
 
-class StubFrameOwner : public NoBaseWillBeGarbageCollectedFinalized<StubFrameOwner>, public FrameOwner {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(StubFrameOwner);
-public:
-    static PassOwnPtrWillBeRawPtr<StubFrameOwner> create()
-    {
-        return adoptPtrWillBeNoop(new StubFrameOwner);
-    }
-
-    DEFINE_INLINE_VIRTUAL_TRACE() { FrameOwner::trace(visitor); }
-
-    bool isLocal() const override { return false; }
-    SandboxFlags getSandboxFlags() const override { return SandboxNone; }
-    void dispatchLoad() override { }
-    void renderFallbackContent() override { }
-    ScrollbarMode scrollingMode() const override { return ScrollbarAuto; }
-    int marginWidth() const override { return -1; }
-    int marginHeight() const override { return -1; }
-};
-
 class MockFrameLoaderClient : public EmptyFrameLoaderClient {
 public:
     MockFrameLoaderClient()
         : EmptyFrameLoaderClient()
     {
     }
     MOCK_METHOD4(didDisplayContentWithCertificateErrors, void(const KURL&, const CString&, const WebURL&, const CString&));
 };
 
 class FrameFetchContextTest : public ::testing::Test {
 protected:
     void SetUp() override
     {
         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());
         fetchContext = static_cast<FrameFetchContext*>(&documentLoader->fetcher()->context());
-        owner = StubFrameOwner::create();
+        owner = DummyFrameOwner::create();
         FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
     }
 
     void TearDown() override
     {
         documentLoader->detachFromFrame();
         documentLoader.clear();
 
         if (childFrame) {
             childDocumentLoader->detachFromFrame();
@@ skipping 19 matching lines @@
     // We don't use the DocumentLoader directly in any tests, but need to keep it around as long
     // as the ResourceFetcher and Document live due to indirect usage.
     RefPtrWillBePersistent<DocumentLoader> documentLoader;
     RefPtrWillBePersistent<Document> document;
     Persistent<FrameFetchContext> fetchContext;
 
     OwnPtrWillBePersistent<StubFrameLoaderClientWithParent> childClient;
     RefPtrWillBePersistent<LocalFrame> childFrame;
     RefPtrWillBePersistent<DocumentLoader> childDocumentLoader;
     RefPtrWillBePersistent<Document> childDocument;
-    OwnPtrWillBePersistent<StubFrameOwner> owner;
+    OwnPtrWillBePersistent<DummyFrameOwner> owner;
 };
 
 // This test class sets up a mock frame loader client that expects a
 // call to didDisplayContentWithCertificateErrors().
 class FrameFetchContextDisplayedCertificateErrorsTest : public FrameFetchContextTest {
 protected:
     void SetUp() override
     {
         url = KURL(KURL(), "https://example.test/foo");
         securityInfo = "security info";
         mainResourceUrl = KURL(KURL(), "https://www.example.test");
         MockFrameLoaderClient* client = new MockFrameLoaderClient;
         EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(url, securityInfo, WebURL(mainResourceUrl), CString()));
         dummyPageHolder = DummyPageHolder::create(IntSize(500, 500), nullptr, adoptPtrWillBeNoop(client));
         dummyPageHolder->page().setDeviceScaleFactor(1.0);
         documentLoader = DocumentLoader::create(&dummyPageHolder->frame(), ResourceRequest(mainResourceUrl), SubstituteData());
         document = toHTMLDocument(&dummyPageHolder->document());
         document->setURL(mainResourceUrl);
         fetchContext = static_cast<FrameFetchContext*>(&documentLoader->fetcher()->context());
-        owner = StubFrameOwner::create();
+        owner = DummyFrameOwner::create();
         FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
     }
 
     KURL url;
     KURL mainResourceUrl;
     CString securityInfo;
 };
 
 class FrameFetchContextUpgradeTest : public FrameFetchContextTest {
 public:
@@ skipping 545 matching lines @@
         fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
         EXPECT_EQ(mainRequest.isExternalRequest(), test.isExternalExpectation);
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
         EXPECT_EQ(subRequest.isExternalRequest(), test.isExternalExpectation);
     }
 }
 
 } // namespace blink