Move FrameDestructionObserver into LocalFrame.

Source/core/frame/Frame.cpp

Index: Source/core/frame/Frame.cpp
diff --git a/Source/core/frame/Frame.cpp b/Source/core/frame/Frame.cpp
index f3b756c49ab99af3821ed84e453db9e427d38231..4b4894a999c34a8a5722a6e8ba17a18391c5a651 100644
--- a/Source/core/frame/Frame.cpp
+++ b/Source/core/frame/Frame.cpp
@@ -33,7 +33,6 @@
 #include "core/dom/DocumentType.h"
 #include "core/events/Event.h"
 #include "core/frame/LocalDOMWindow.h"
-#include "core/frame/FrameDestructionObserver.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameElementBase.h"
@@ -90,20 +89,6 @@ Frame::~Frame()
 #ifndef NDEBUG
     frameCounter.decrement();
 #endif
-
-    HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.end();
-    for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObservers.begin(); it != stop; ++it)
-        (*it)->frameDestroyed();
-}
-
-void Frame::addDestructionObserver(FrameDestructionObserver* observer)
-{
-    m_destructionObservers.add(observer);
-}
-
-void Frame::removeDestructionObserver(FrameDestructionObserver* observer)
-{
-    m_destructionObservers.remove(observer);
 }
 
 FrameHost* Frame::host() const
@@ -175,24 +160,6 @@ void Frame::setRemotePlatformLayer(blink::WebLayer* layer)
         renderer->layer()->updateSelfPaintingLayer();
 }
 
-void Frame::willDetachFrameHost()
-{
-    HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.end();
-    for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObservers.begin(); it != stop; ++it)
-        (*it)->willDetachFrameHost();
-
-    // FIXME: Page should take care of updating focus/scrolling instead of Frame.
-    // FIXME: It's unclear as to why this is called more than once, but it is,
-    // so page() could be null.
-    if (page() && page()->focusController().focusedFrame() == this)
-        page()->focusController().setFocusedFrame(nullptr);
-}
-
-void Frame::detachFromFrameHost()
-{
-    m_host = 0;
-}
-
 bool Frame::isMainFrame() const
 {
     Page* page = this->page();