Remove internals.setEnableMockPagePopup().

Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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.
@@ skipping 30 matching lines @@
 #include "core/frame/Console.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/forms/ColorChooser.h"
 #include "core/html/forms/ColorChooserClient.h"
 #include "core/html/forms/DateTimeChooser.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/page/Page.h"
-#include "core/page/PagePopupDriver.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderPart.h"
 #include "core/rendering/compositing/CompositedSelectionBound.h"
 #include "modules/accessibility/AXObject.h"
 #include "platform/Cursor.h"
 #include "platform/FileChooser.h"
 #include "platform/PlatformScreen.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/exported/WrappedResourceRequest.h"
 #include "platform/geometry/FloatRect.h"
@@ skipping 58 matching lines @@
     // These enums have the same values; enforced in AssertMatchingEnums.cpp.
     WebSelectionBound result(static_cast<WebSelectionBound::Type>(bound.type));
     result.layerId = bound.layer->platformLayer()->id();
     result.edgeTopInLayer = roundedIntPoint(bound.edgeTopInLayer);
     result.edgeBottomInLayer = roundedIntPoint(bound.edgeBottomInLayer);
     return result;
 }
 
 ChromeClientImpl::ChromeClientImpl(WebViewImpl* webView)
     : m_webView(webView)
-    , m_pagePopupDriver(webView)
 {
 }
 
 ChromeClientImpl::~ChromeClientImpl()
 {
 }
 
 void* ChromeClientImpl::webView() const
 {
     return static_cast<void*>(m_webView);
@@ skipping 582 matching lines @@
 PassRefPtrWillBeRawPtr<PopupMenu> ChromeClientImpl::createPopupMenu(LocalFrame& frame, PopupMenuClient* client) const
 {
     if (WebViewImpl::useExternalPopupMenus())
         return adoptRefWillBeNoop(new ExternalPopupMenu(frame, client, *m_webView));
 
     return adoptRefWillBeNoop(new PopupMenuChromium(frame, client));
 }
 
 PagePopup* ChromeClientImpl::openPagePopup(PagePopupClient* client, const IntRect& originBoundsInRootView)
 {
-    ASSERT(m_pagePopupDriver);
-    return m_pagePopupDriver->openPagePopup(client, originBoundsInRootView);
+    return m_webView->openPagePopup(client, originBoundsInRootView);
 }
 
 void ChromeClientImpl::closePagePopup(PagePopup* popup)
 {
-    ASSERT(m_pagePopupDriver);
-    m_pagePopupDriver->closePagePopup(popup);
+    m_webView->closePagePopup(popup);
 }
 
-void ChromeClientImpl::setPagePopupDriver(PagePopupDriver* driver)
+DOMWindow* ChromeClientImpl::pagePopupWindowForTesting() const
 {
-    ASSERT(driver);
-    m_pagePopupDriver = driver;
-}
-
-void ChromeClientImpl::resetPagePopupDriver()
-{
-    m_pagePopupDriver = m_webView;
+    return m_webView->pagePopupWindow();
 }
 
 bool ChromeClientImpl::shouldRunModalDialogDuringPageDismissal(const DialogType& dialogType, const String& dialogMessage, Document::PageDismissalType dismissalType) const
 {
     const char* kDialogs[] = {"alert", "confirm", "prompt", "showModalDialog"};
     int dialog = static_cast<int>(dialogType);
     ASSERT_WITH_SECURITY_IMPLICATION(0 <= dialog && dialog < static_cast<int>(arraysize(kDialogs)));
 
     const char* kDismissals[] = {"beforeunload", "pagehide", "unload"};
     int dismissal = static_cast<int>(dismissalType) - 1; // Exclude NoDismissal.
@@ skipping 112 matching lines @@
 }
 
 void ChromeClientImpl::textFieldDataListChanged(HTMLFormControlElement& element)
 {
     if (!m_webView->autofillClient())
         return;
     m_webView->autofillClient()->textFieldDidChange(WebFormControlElement(&element));
 }
 
 } // namespace blink