Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/web/tests/WebViewTest.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 226 matching lines @@
         URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(fileName.c_str()));
     }
 
     void testAutoResize(const WebSize& minAutoResize, const WebSize& maxAutoResize,
                         const std::string& pageWidth, const std::string& pageHeight,
                         int expectedWidth, int expectedHeight,
                         HorizontalScrollbarState expectedHorizontalState, VerticalScrollbarState expectedVerticalState);
 
     void testTextInputType(WebTextInputType expectedType, const std::string& htmlFile);
     void testInputMode(const WebString& expectedInputMode, const std::string& htmlFile);
-    bool tapElement(WebInputEvent::Type, const PassRefPtrWillBeRawPtr<Element>&);
+    bool tapElement(WebInputEvent::Type, const RawPtr<Element>&);
     bool tapElementById(WebInputEvent::Type, const WebString& id);
 
     std::string m_baseURL;
     FrameTestHelpers::WebViewHelper m_webViewHelper;
 };
 
 TEST_F(WebViewTest, SaveImageAt)
 {
     SaveImageFromDataURLWebViewClient client;
 
@@ skipping 971 matching lines @@
 TEST_F(WebViewTest, BackForwardRestoreScroll)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("back_forward_restore_scroll.html"));
     WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(m_baseURL + "back_forward_restore_scroll.html");
     webViewImpl->resize(WebSize(640, 480));
     webViewImpl->updateAllLifecyclePhases();
 
     // Emulate a user scroll
     webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 900));
     LocalFrame* mainFrameLocal = toLocalFrame(webViewImpl->page()->mainFrame());
-    RefPtrWillBePersistent<HistoryItem> item1 = mainFrameLocal->loader().currentItem();
+    Persistent<HistoryItem> item1 = mainFrameLocal->loader().currentItem();
 
     // Click an anchor
     mainFrameLocal->loader().load(FrameLoadRequest(mainFrameLocal->document(), ResourceRequest(mainFrameLocal->document()->completeURL("#a"))));
-    RefPtrWillBePersistent<HistoryItem> item2 = mainFrameLocal->loader().currentItem();
+    Persistent<HistoryItem> item2 = mainFrameLocal->loader().currentItem();
 
     // Go back, then forward, then back again.
     mainFrameLocal->loader().load(
         FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
             item1.get(), UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item1.get(), HistorySameDocumentLoad);
     mainFrameLocal->loader().load(
         FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
             item2.get(), UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item2.get(), HistorySameDocumentLoad);
     mainFrameLocal->loader().load(
         FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
             item1.get(), UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item1.get(), HistorySameDocumentLoad);
 
     // Click a different anchor
     mainFrameLocal->loader().load(FrameLoadRequest(mainFrameLocal->document(), ResourceRequest(mainFrameLocal->document()->completeURL("#b"))));
-    RefPtrWillBePersistent<HistoryItem> item3 = mainFrameLocal->loader().currentItem();
+    Persistent<HistoryItem> item3 = mainFrameLocal->loader().currentItem();
 
     // Go back, then forward. The scroll position should be properly set on the forward navigation.
     mainFrameLocal->loader().load(
         FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
             item1.get(), UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item1.get(), HistorySameDocumentLoad);
     mainFrameLocal->loader().load(
         FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
             item3.get(), UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item3.get(), HistorySameDocumentLoad);
@@ skipping 14 matching lines @@
     // Make the page scale and scroll with the given paremeters.
     webViewImpl->setPageScaleFactor(2.0f);
     webViewImpl->mainFrame()->setScrollOffset(WebSize(94, 111));
     webViewImpl->setVisualViewportOffset(WebFloatPoint(12, 20));
     EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
     EXPECT_EQ(94, webViewImpl->mainFrame()->scrollOffset().width);
     EXPECT_EQ(111, webViewImpl->mainFrame()->scrollOffset().height);
     EXPECT_EQ(12, webViewImpl->visualViewportOffset().x);
     EXPECT_EQ(20, webViewImpl->visualViewportOffset().y);
 
-    RefPtrWillBeRawPtr<Element> element = static_cast<PassRefPtrWillBeRawPtr<Element>>(webViewImpl->mainFrame()->document().body());
+    RawPtr<Element> element = static_cast<RawPtr<Element>>(webViewImpl->mainFrame()->document().body());
     webViewImpl->enterFullScreenForElement(element.get());
     webViewImpl->didEnterFullScreen();
 
     // Page scale factor must be 1.0 during fullscreen for elements to be sized
     // properly.
     EXPECT_EQ(1.0f, webViewImpl->pageScaleFactor());
 
     // Make sure fullscreen nesting doesn't disrupt scroll/scale saving.
-    RefPtrWillBeRawPtr<Element> otherElement = static_cast<PassRefPtrWillBeRawPtr<Element>>(webViewImpl->mainFrame()->document().head());
+    RawPtr<Element> otherElement = static_cast<RawPtr<Element>>(webViewImpl->mainFrame()->document().head());
     webViewImpl->enterFullScreenForElement(otherElement.get());
 
     // Confirm that exiting fullscreen restores the parameters.
     webViewImpl->didExitFullScreen();
     EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
     EXPECT_EQ(94, webViewImpl->mainFrame()->scrollOffset().width);
     EXPECT_EQ(111, webViewImpl->mainFrame()->scrollOffset().height);
     EXPECT_EQ(12, webViewImpl->visualViewportOffset().x);
     EXPECT_EQ(20, webViewImpl->visualViewportOffset().y);
 
@@ skipping 114 matching lines @@
     void setContentDetectionResult(const WebContentDetectionResult& result) { m_contentDetectionResult = result; }
 
 private:
     bool m_contentDetectionRequested;
     bool m_pendingIntentsCancelled;
     WebURL m_scheduledIntentURL;
     bool m_wasInMainFrame;
     WebContentDetectionResult m_contentDetectionResult;
 };
 
-bool WebViewTest::tapElement(WebInputEvent::Type type, const PassRefPtrWillBeRawPtr<Element>& element)
+bool WebViewTest::tapElement(WebInputEvent::Type type, const RawPtr<Element>& element)
 {
     if (!element || !element->layoutObject())
         return false;
 
     ASSERT(m_webViewHelper.webView());
     element->scrollIntoViewIfNeeded();
 
     // TODO(bokan): Technically incorrect, event positions should be in viewport space. crbug.com/371902.
     IntPoint center = m_webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->contentsToScreen(
         element->layoutObject()->absoluteBoundingBoxRect()).center();
 
     WebGestureEvent event;
     event.type = type;
     event.sourceDevice = WebGestureDeviceTouchscreen;
     event.x = center.x();
     event.y = center.y();
 
     m_webViewHelper.webView()->handleInputEvent(event);
     runPendingTasks();
     return true;
 }
 
 bool WebViewTest::tapElementById(WebInputEvent::Type type, const WebString& id)
 {
     ASSERT(m_webViewHelper.webView());
-    RefPtrWillBeRawPtr<Element> element = static_cast<PassRefPtrWillBeRawPtr<Element>>(m_webViewHelper.webView()->mainFrame()->document().getElementById(id));
+    RawPtr<Element> element = static_cast<RawPtr<Element>>(m_webViewHelper.webView()->mainFrame()->document().getElementById(id));
     return tapElement(type, element);
 }
 
 TEST_F(WebViewTest, DetectContentAroundPosition)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("content_listeners.html"));
 
     ContentDetectorClient client;
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "content_listeners.html", true, 0, &client);
     webView->resize(WebSize(500, 300));
@@ skipping 51 matching lines @@
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "content_listeners_iframe.html", true, 0, &client);
     webView->resize(WebSize(500, 300));
     webView->updateAllLifecyclePhases();
     runPendingTasks();
 
     WebString noListener = WebString::fromUTF8("noListener");
     WebString frameName = WebString::fromUTF8("innerFrame");
 
     WebURL intentURL = toKURL(m_baseURL);
     client.setContentDetectionResult(WebContentDetectionResult(WebRange(), WebString(), intentURL));
-    RefPtrWillBeRawPtr<Element> element = static_cast<PassRefPtrWillBeRawPtr<Element>>(webView->findFrameByName(frameName)->document().getElementById(noListener));
+    RawPtr<Element> element = static_cast<RawPtr<Element>>(webView->findFrameByName(frameName)->document().getElementById(noListener));
     EXPECT_TRUE(tapElement(WebInputEvent::GestureTap, element));
     EXPECT_TRUE(client.scheduledIntentURL() == intentURL);
     EXPECT_FALSE(client.wasInMainFrame());
 
     m_webViewHelper.reset(); // Explicitly reset to break dependency on locally scoped client.
 }
 
 TEST_F(WebViewTest, ClientTapHandling)
 {
     TapHandlingWebViewClient client;
@@ skipping 879 matching lines @@
 // This test checks that deleting nodes which have only non-JS-registered touch
 // handlers also removes them from the event handler registry. Note that this
 // is different from detaching and re-attaching the same node, which is covered
 // by layout tests under fast/events/.
 TEST_F(WebViewTest, DeleteElementWithRegisteredHandler)
 {
     std::string url = m_baseURL + "simple_div.html";
     URLTestHelpers::registerMockedURLLoad(toKURL(url), "simple_div.html");
     WebViewImpl* webViewImpl = m_webViewHelper.initializeAndLoad(url, true);
 
-    RefPtrWillBePersistent<Document> document = webViewImpl->mainFrameImpl()->frame()->document();
+    Persistent<Document> document = webViewImpl->mainFrameImpl()->frame()->document();
     Element* div = document->getElementById("div");
     EventHandlerRegistry& registry = document->frameHost()->eventHandlerRegistry();
 
     registry.didAddEventHandler(*div, EventHandlerRegistry::ScrollEvent);
     EXPECT_TRUE(registry.hasEventHandlers(EventHandlerRegistry::ScrollEvent));
 
     TrackExceptionState exceptionState;
     div->remove(exceptionState);
 #if ENABLE(OILPAN)
     // For oilpan we have to force a GC to ensure the event handlers have been removed when
@@ skipping 796 matching lines @@
     frame->setAutofillClient(&client);
     webView->setInitialFocus(false);
 
     EXPECT_TRUE(webView->confirmComposition(WebString::fromUTF8(std::string("hello").c_str())));
     EXPECT_EQ(1, client.textChangesFromUserGesture());
     EXPECT_FALSE(UserGestureIndicator::processingUserGesture());
     frame->setAutofillClient(0);
 }
 
 } // namespace blink