Fix 3 more leaks in WebPluginContainerTests.

Source/web/tests/WebPluginContainerTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 190 matching lines @@
     frame->printBegin(printParams);
     SkPictureRecorder recorder;
     frame->printPagesWithBoundaries(recorder.beginRecording(IntRect()), WebSize());
     frame->printEnd();
     ASSERT(pluginWebFrameClient.printedAtLeastOnePage());
 }
 
 TEST_F(WebPluginContainerTest, LocalToWindowPointTest)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("plugin_container.html"));
+    TestPluginWebFrameClient pluginWebFrameClient; // Must outlive webViewHelper.
     FrameTestHelpers::WebViewHelper webViewHelper;
-    WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "plugin_container.html", true, new TestPluginWebFrameClient());
+    WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "plugin_container.html", true, &pluginWebFrameClient);
     ASSERT(webView);
     webView->settings()->setPluginsEnabled(true);
     webView->resize(WebSize(300, 300));
     webView->layout();
     runPendingTasks();
 
     WebPluginContainer* pluginContainerOne = getWebPluginContainer(webView, WebString::fromUTF8("translated-plugin"));
     ASSERT(pluginContainerOne);
     WebPoint point1 = pluginContainerOne->localToRootFramePoint(WebPoint(0, 0));
     ASSERT_EQ(10, point1.x);
@@ skipping 93 matching lines @@
             return new EventTestPlugin(frame, params);
         return WebFrameClient::createPlugin(frame, params);
     }
 };
 
 TEST_F(WebPluginContainerTest, GestureLongPressReachesPlugin)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(
         WebString::fromUTF8(m_baseURL.c_str()),
         WebString::fromUTF8("plugin_container.html"));
+    EventTestPluginWebFrameClient pluginWebFrameClient; // Must outlive webViewHelper.
     FrameTestHelpers::WebViewHelper webViewHelper;
-    WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "plugin_container.html", true, new EventTestPluginWebFrameClient());
+    WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "plugin_container.html", true, &pluginWebFrameClient);
     ASSERT(webView);
     webView->settings()->setPluginsEnabled(true);
     webView->resize(WebSize(300, 300));
     webView->layout();
     runPendingTasks();
 
     WebElement pluginContainerOneElement = webView->mainFrame()->document().getElementById(WebString::fromUTF8("translated-plugin"));
     WebPlugin* plugin = static_cast<WebPluginContainerImpl*>(pluginContainerOneElement.pluginContainer())->plugin();
     EventTestPlugin* testPlugin = static_cast<EventTestPlugin*>(plugin);
 
@@ skipping 71 matching lines @@
     };
 
     class TopmostPluginWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
         WebPlugin* createPlugin(WebLocalFrame* frame, const WebPluginParams& params) override
         {
             return new TopmostPlugin(frame, params);
         }
     };
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("plugin_container.html"));
+    TopmostPluginWebFrameClient pluginWebFrameClient; // Must outlive webViewHelper.
     FrameTestHelpers::WebViewHelper webViewHelper;
-    WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "plugin_container.html", true, new TopmostPluginWebFrameClient());
+    WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "plugin_container.html", true, &pluginWebFrameClient);
     ASSERT(webView);
     webView->settings()->setPluginsEnabled(true);
     webView->resize(WebSize(300, 300));
     webView->layout();
     runPendingTasks();
 
     RefPtrWillBeRawPtr<WebPluginContainerImpl> pluginContainerImpl =
         toWebPluginContainerImpl(getWebPluginContainer(webView, WebString::fromUTF8("translated-plugin")));
     pluginContainerImpl->setFrameRect(IntRect(0, 0, 300, 300));
 
     EXPECT_TRUE(pluginContainerImpl->isRectTopmost(topmostRect));
 
     TopmostPlugin* testPlugin = static_cast<TopmostPlugin*>(pluginContainerImpl->plugin());
     EXPECT_TRUE(testPlugin->isRectTopmost());
 
     // Cause the plugin's frame to be detached.
     webViewHelper.reset();
 
     EXPECT_FALSE(pluginContainerImpl->isRectTopmost(topmostRect));
 }
 
 } // namespace blink