| Index: Source/web/tests/FrameLoaderClientImplTest.cpp
|
| diff --git a/Source/web/tests/FrameLoaderClientImplTest.cpp b/Source/web/tests/FrameLoaderClientImplTest.cpp
|
| index e41062f3849016891920538a7b17eb8172a8adaf..bb2a8c3de50f7998e1fcbcac7ab513456b8ee1e9 100644
|
| --- a/Source/web/tests/FrameLoaderClientImplTest.cpp
|
| +++ b/Source/web/tests/FrameLoaderClientImplTest.cpp
|
| @@ -34,11 +34,8 @@
|
| #include "core/loader/FrameLoader.h"
|
| #include "platform/weborigin/KURL.h"
|
| #include "public/web/WebFrameClient.h"
|
| -#include "public/web/WebPluginParams.h"
|
| -#include "public/web/WebPluginPlaceholder.h"
|
| #include "public/web/WebSettings.h"
|
| #include "public/web/WebView.h"
|
| -#include "web/PluginPlaceholderImpl.h"
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/tests/FrameTestHelpers.h"
|
| #include "wtf/text/CString.h"
|
| @@ -58,7 +55,6 @@ public:
|
| ~MockWebFrameClient() override { }
|
|
|
| MOCK_METHOD2(userAgentOverride, WebString(WebLocalFrame*, const WebURL&));
|
| - MOCK_METHOD2(createPluginPlaceholder, WebPluginPlaceholder*(WebLocalFrame*, const WebPluginParams&));
|
| };
|
|
|
| class FrameLoaderClientImplTest : public ::testing::Test {
|
| @@ -118,34 +114,5 @@ TEST_F(FrameLoaderClientImplTest, UserAgentOverride)
|
| EXPECT_TRUE(defaultUserAgent.equals(userAgent()));
|
| }
|
|
|
| -TEST_F(FrameLoaderClientImplTest, CreatePluginPlaceholderForwardsToWebFrameClient)
|
| -{
|
| - KURL url(ParsedURLString, "http://www.example.com/plugin.swf");
|
| - Vector<String> paramNames(1, "param");
|
| - Vector<String> paramValues(1, "value");
|
| - String mimeType = "application/x-shockwave-flash";
|
| - bool loadManually = false;
|
| -
|
| - // Test with a valid WebPluginPlaceholder.
|
| - {
|
| - WebPluginPlaceholder* webPluginPlaceholder = new WebPluginPlaceholder;
|
| - EXPECT_CALL(webFrameClient(), createPluginPlaceholder(mainFrame(), _))
|
| - .WillOnce(Return(webPluginPlaceholder));
|
| - OwnPtrWillBeRawPtr<PluginPlaceholder> pluginPlaceholder = frameLoaderClient().createPluginPlaceholder(
|
| - document(), url, paramNames, paramValues, mimeType, loadManually);
|
| - ASSERT_TRUE(pluginPlaceholder);
|
| - EXPECT_EQ(webPluginPlaceholder, static_cast<PluginPlaceholderImpl*>(pluginPlaceholder.get())->webPluginPlaceholder());
|
| - }
|
| -
|
| - // Test with no WebPluginPlaceholder.
|
| - {
|
| - EXPECT_CALL(webFrameClient(), createPluginPlaceholder(mainFrame(), _))
|
| - .WillOnce(Return(nullptr));
|
| - OwnPtrWillBeRawPtr<PluginPlaceholder> pluginPlaceholder = frameLoaderClient().createPluginPlaceholder(
|
| - document(), url, paramNames, paramValues, mimeType, loadManually);
|
| - ASSERT_FALSE(pluginPlaceholder);
|
| - }
|
| -}
|
| -
|
| } // namespace
|
| } // namespace blink
|
|
|