Cleanup FrameLoader::opener() to return a Frame*.

BUG=none

Review URL: https://codereview.chromium.org/476083002

git-svn-id: svn://svn.chromium.org/blink/trunk@180412 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

@@ -1276,7 +1276,7 @@ LocalDOMWindow* LocalDOMWindow::opener() const
     if (!m_frame)
         return 0;
 
-    LocalFrame* opener = m_frame->loader().opener();
+    Frame* opener = m_frame->loader().opener();
     if (!opener)
         return 0;
 

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

@@ -498,10 +498,9 @@ void FrameLoader::scheduleCheckCompleted()
         m_checkTimer.startOneShot(0, FROM_HERE);
 }
 
-LocalFrame* FrameLoader::opener()
+Frame* FrameLoader::opener()
 {
-    // FIXME: Temporary hack to stage converting locations that really should be Frame.
-    return client() ? toLocalFrame(client()->opener()) : 0;
+    return client() ? client()->opener() : 0;
 }
 
 void FrameLoader::setOpener(LocalFrame* opener)

third_party/WebKit/Source/core/loader/FrameLoader.h

@@ -48,7 +48,6 @@
 
 namespace blink {
 
-class Resource;
 class Chrome;
 class DOMWrapperWorld;
 class DocumentLoader;
@@ -56,6 +55,7 @@ class Event;
 class FetchContext;
 class FormState;
 class FormSubmission;
+class Frame;
 class FrameLoaderClient;
 class IconController;
 class NavigationAction;
@@ -155,7 +155,7 @@ public:
     void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
     SandboxFlags effectiveSandboxFlags() const;
 
-    LocalFrame* opener();
+    Frame* opener();
     void setOpener(LocalFrame*);
 
     void detachFromParent();