Fix use-after-scope issue in WebFrameTest.

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 4100 matching lines @@
   const std::string secondURL = "content-width-1000.html";
   const std::string thirdURL = "very_tall_div.html";
   const float pageScaleFactor = 1.1684f;
   const int pageWidth = 120;
   const int pageHeight = 100;
 
   registerMockedHttpURLLoad(firstURL);
   registerMockedHttpURLLoad(secondURL);
   registerMockedHttpURLLoad(thirdURL);
 
+  ClearScrollStateOnCommitWebFrameClient client;
   FrameTestHelpers::WebViewHelper webViewHelper;
-  ClearScrollStateOnCommitWebFrameClient client;
   webViewHelper.initializeAndLoad(m_baseURL + firstURL, true, &client);
   webViewHelper.resize(WebSize(pageWidth, pageHeight));
   webViewHelper.webView()->mainFrame()->setScrollOffset(
       WebSize(pageWidth / 4, pageHeight / 4));
   webViewHelper.webView()->setPageScaleFactor(pageScaleFactor);
 
   WebSize previousOffset =
       webViewHelper.webView()->mainFrame()->getScrollOffset();
   float previousScale = webViewHelper.webView()->pageScaleFactor();
 
@@ skipping 3258 matching lines @@
   bool m_replacesCurrentHistoryItem;
   WebFrame* m_frame;
 };
 
 // Tests that the first navigation in an initially blank subframe will result in
 // a history entry being replaced and not a new one being added.
 TEST_P(ParameterizedWebFrameTest, FirstBlankSubframeNavigation) {
   registerMockedHttpURLLoad("history.html");
   registerMockedHttpURLLoad("find.html");
 
+  TestHistoryWebFrameClient client;
   FrameTestHelpers::WebViewHelper webViewHelper;
-  TestHistoryWebFrameClient client;
   webViewHelper.initializeAndLoad("about:blank", true, &client);
 
   WebFrame* frame = webViewHelper.webView()->mainFrame();
 
   frame->executeScript(WebScriptSource(WebString::fromUTF8(
       "document.body.appendChild(document.createElement('iframe'))")));
 
   WebFrame* iframe = frame->firstChild();
   ASSERT_EQ(&client, toWebLocalFrameImpl(iframe)->client());
   EXPECT_EQ(iframe, client.frame());
@@ skipping 10 matching lines @@
   EXPECT_EQ(url2, iframe->document().url().string().utf8());
   EXPECT_FALSE(client.replacesCurrentHistoryItem());
 }
 
 // Tests that a navigation in a frame with a non-blank initial URL will create
 // a new history item, unlike the case above.
 TEST_P(ParameterizedWebFrameTest, FirstNonBlankSubframeNavigation) {
   registerMockedHttpURLLoad("history.html");
   registerMockedHttpURLLoad("find.html");
 
+  TestHistoryWebFrameClient client;
   FrameTestHelpers::WebViewHelper webViewHelper;
-  TestHistoryWebFrameClient client;
   webViewHelper.initializeAndLoad("about:blank", true, &client);
 
   WebFrame* frame = webViewHelper.webView()->mainFrame();
 
   std::string url1 = m_baseURL + "history.html";
   FrameTestHelpers::loadFrame(
       frame,
       "javascript:var f = document.createElement('iframe'); "
       "f.src = '" +
           url1 +
@@ skipping 994 matching lines @@
   bool didNotify() const { return m_didNotify; }
 
  private:
   virtual void didChangeThemeColor() { m_didNotify = true; }
 
   bool m_didNotify;
 };
 
 TEST_P(ParameterizedWebFrameTest, ThemeColor) {
   registerMockedHttpURLLoad("theme_color_test.html");
+  ThemeColorTestWebFrameClient client;
   FrameTestHelpers::WebViewHelper webViewHelper;
-  ThemeColorTestWebFrameClient client;
   webViewHelper.initializeAndLoad(m_baseURL + "theme_color_test.html", true,
                                   &client);
   EXPECT_TRUE(client.didNotify());
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   EXPECT_EQ(0xff0000ff, frame->document().themeColor());
   // Change color by rgb.
   client.reset();
   frame->executeScript(
       WebScriptSource("document.getElementById('tc1').setAttribute('content', "
                       "'rgb(0, 0, 0)');"));
@@ skipping 1640 matching lines @@
     EXPECT_EQ(6, m_callbackCount++);
     FrameTestHelpers::TestWebFrameClient::didStopLoading();
   }
 
  private:
   int m_callbackCount;
 };
 
 TEST_F(WebFrameTest, CallbackOrdering) {
   registerMockedHttpURLLoad("foo.html");
+  CallbackOrderingWebFrameClient client;
   FrameTestHelpers::WebViewHelper webViewHelper;
-  CallbackOrderingWebFrameClient client;
   webViewHelper.initializeAndLoad(m_baseURL + "foo.html", true, &client);
 }
 
 class TestWebRemoteFrameClientForVisibility
     : public FrameTestHelpers::TestWebRemoteFrameClient {
  public:
   TestWebRemoteFrameClientForVisibility() : m_visible(true) {}
   void visibilityChanged(bool visible) override { m_visible = visible; }
 
   bool isVisible() const { return m_visible; }
@@ skipping 1038 matching lines @@
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink