Oilpan: Fix a raw pointer in FrameLoaderClientImplTest.

Source/web/tests/FrameLoaderClientImplTest.cpp

 /*
  * Copyright (C) 2011, 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 56 matching lines @@
     {
         ON_CALL(m_webFrameClient, userAgentOverride(_, _)).WillByDefault(Return(WebString()));
 
         FrameTestHelpers::TestWebViewClient webViewClient;
         m_webView = WebView::create(&webViewClient);
         // FIXME: http://crbug.com/363843. This needs to find a better way to
         // not create graphics layers.
         m_webView->settings()->setAcceleratedCompositingEnabled(false);
         m_mainFrame = WebLocalFrame::create(WebTreeScopeType::Document, &m_webFrameClient);
         m_webView->setMainFrame(m_mainFrame);
-        m_frameLoaderClientImpl = toFrameLoaderClientImpl(toWebLocalFrameImpl(m_webView->mainFrame())->frame()->loader().client());
     }
 
     void TearDown() override
     {
         m_webView->close();
         m_mainFrame->close();
     }
 
     WebString userAgent()
     {
         // The test always returns the same user agent, regardless of the URL passed in.
         KURL dummyURL(ParsedURLString, "about:blank");
-        WTF::CString userAgent = m_frameLoaderClientImpl->userAgent(dummyURL).utf8();
+        WTF::CString userAgent = frameLoaderClientImpl().userAgent(dummyURL).utf8();

[sof, 2015/08/25 10:37:14]

You can use frameLoaderClient() for this also (and avoid the need for
frameLoaderClientImpl()).

[Yuta Kitamura, 2015/08/26 05:32:30]

OK, I'll follow up on this. Follow-up of a follow-up ;)

         return WebString::fromUTF8(userAgent.data(), userAgent.length());
     }
 
     WebLocalFrameImpl* mainFrame() { return toWebLocalFrameImpl(m_webView->mainFrame()); }
     Document& document() { return *toWebLocalFrameImpl(m_mainFrame)->frame()->document(); }
     MockWebFrameClient& webFrameClient() { return m_webFrameClient; }
-    FrameLoaderClient& frameLoaderClient() { return *m_frameLoaderClientImpl; }
+    FrameLoaderClient& frameLoaderClient() { return frameLoaderClientImpl(); }
+    FrameLoaderClientImpl& frameLoaderClientImpl() { return *toFrameLoaderClientImpl(toWebLocalFrameImpl(m_webView->mainFrame())->frame()->loader().client()); }
 
 private:
     MockWebFrameClient m_webFrameClient;
-    FrameLoaderClientImpl* m_frameLoaderClientImpl;
     WebView* m_webView;
     WebFrame* m_mainFrame;
 };
 
 TEST_F(FrameLoaderClientImplTest, UserAgentOverride)
 {
     const WebString defaultUserAgent = userAgent();
     const WebString overrideUserAgent = WebString::fromUTF8("dummy override");
 
     // Override the user agent and make sure we get it back.
@@ skipping 30 matching lines @@
         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