| Index: third_party/WebKit/Source/web/tests/WebHelperPluginTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/WebHelperPluginTest.cpp b/third_party/WebKit/Source/web/tests/WebHelperPluginTest.cpp
|
| index a479ed64aefdedd1493470c8474ff1531e05cfbf..9a02277127de4e194010247a14be4942684c54cf 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebHelperPluginTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebHelperPluginTest.cpp
|
| @@ -59,12 +59,12 @@ protected:
|
|
|
| FrameTestHelpers::WebViewHelper m_helper;
|
| WebHelperPluginFrameClient m_frameClient;
|
| - OwnPtr<WebHelperPlugin> m_plugin;
|
| + WebHelperPluginUniquePtr m_plugin;
|
| };
|
|
|
| TEST_F(WebHelperPluginTest, CreateAndDestroyAfterWebViewDestruction)
|
| {
|
| - m_plugin = adoptPtr(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()->toWebLocalFrame()));
|
| + m_plugin.reset(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()->toWebLocalFrame()));
|
| EXPECT_TRUE(m_plugin);
|
| EXPECT_TRUE(m_plugin->getPlugin());
|
|
|
| @@ -74,7 +74,7 @@ TEST_F(WebHelperPluginTest, CreateAndDestroyAfterWebViewDestruction)
|
|
|
| TEST_F(WebHelperPluginTest, CreateAndDestroyBeforeWebViewDestruction)
|
| {
|
| - m_plugin = adoptPtr(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()->toWebLocalFrame()));
|
| + m_plugin.reset(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()->toWebLocalFrame()));
|
| EXPECT_TRUE(m_plugin);
|
| EXPECT_TRUE(m_plugin->getPlugin());
|
|
|
| @@ -86,7 +86,7 @@ TEST_F(WebHelperPluginTest, CreateFailsWithPlaceholder)
|
| {
|
| m_frameClient.setCreatePlaceholder(true);
|
|
|
| - m_plugin = adoptPtr(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()->toWebLocalFrame()));
|
| + m_plugin.reset(WebHelperPlugin::create("hello", m_helper.webView()->mainFrame()->toWebLocalFrame()));
|
| EXPECT_EQ(0, m_plugin.get());
|
| }
|
|
|
|
|