Change Frame to store a Page instead of a FrameHost.

third_party/WebKit/Source/core/frame/Frame.h

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 71 matching lines @@
   // to be started on a timer. Use the method above in such cases.
   virtual void navigate(const FrameLoadRequest&) = 0;
   virtual void reload(FrameLoadType, ClientRedirectPolicy) = 0;
 
   virtual void detach(FrameDetachType);
   void disconnectOwnerElement();
   virtual bool shouldClose() = 0;
 
   FrameClient* client() const;
 
-  // NOTE: Page is moving out of Blink up into the browser process as
-  // part of the site-isolation (out of process iframes) work.
-  // FrameHost should be used instead where possible.
-  Page* page() const;
-  FrameHost* host() const;  // Null when the frame is detached.
+  Page* page() const;  // Null when the frame is detached.
+
+  // Deprecated; use page() instead.
+  // TODO(sashab): Remove this method.
+  FrameHost* host() const;
 
   bool isMainFrame() const;
   bool isLocalRoot() const;
 
   FrameOwner* owner() const;
   void setOwner(FrameOwner* owner) { m_owner = owner; }
   HTMLFrameOwnerElement* deprecatedLocalOwner() const;
 
   DOMWindow* domWindow() const { return m_domWindow; }
 
@@ skipping 42 matching lines @@
   void setDocumentHasReceivedUserGesture();
   bool hasReceivedUserGesture() const { return m_hasReceivedUserGesture; }
 
   bool isDetaching() const { return m_isDetaching; }
 
   // Tests whether the feature-policy controlled feature is enabled by policy in
   // the given frame.
   bool isFeatureEnabled(WebFeaturePolicyFeature) const;
 
  protected:
-  Frame(FrameClient*, FrameHost*, FrameOwner*, WindowProxyManager*);
+  Frame(FrameClient*, Page*, FrameOwner*, WindowProxyManager*);
 
   mutable FrameTree m_treeNode;
 
-  Member<FrameHost> m_host;
+  Member<Page> m_page;
   Member<FrameOwner> m_owner;
   Member<DOMWindow> m_domWindow;
 
   bool m_hasReceivedUserGesture = false;
   bool m_isDetaching = false;
 
  private:
   bool canNavigateWithoutFramebusting(const Frame&, String& errorReason);
 
   Member<FrameClient> m_client;
@@ skipping 13 matching lines @@
   return m_treeNode;
 }
 
 // Allow equality comparisons of Frames by reference or pointer,
 // interchangeably.
 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(Frame)
 
 }  // namespace blink
 
 #endif  // Frame_h