| Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp
 | 
| diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
 | 
| index 811dc98397d3349b6fdc21b1ee805cedcdcb7c4f..2cd340841abd73ed0dbe2e650d7c04fad15c3fc2 100644
 | 
| --- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp
 | 
| +++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
 | 
| @@ -1234,11 +1234,11 @@ TEST_F(WebViewTest, BackForwardRestoreScroll)
 | 
|      // 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(
 | 
| @@ -1256,7 +1256,7 @@ TEST_F(WebViewTest, BackForwardRestoreScroll)
 | 
|  
 | 
|      // 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(
 | 
| @@ -1291,7 +1291,7 @@ TEST_F(WebViewTest, EnterFullscreenResetScrollAndScaleState)
 | 
|      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();
 | 
|  
 | 
| @@ -1300,7 +1300,7 @@ TEST_F(WebViewTest, EnterFullscreenResetScrollAndScaleState)
 | 
|      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.
 | 
| @@ -1451,7 +1451,7 @@ private:
 | 
|      WebContentDetectionResult m_contentDetectionResult;
 | 
|  };
 | 
|  
 | 
| -static bool tapElement(WebView* webView, WebInputEvent::Type type, const PassRefPtrWillBeRawPtr<Element>& element)
 | 
| +static bool tapElement(WebView* webView, WebInputEvent::Type type, const RawPtr<Element>& element)
 | 
|  {
 | 
|      if (!element)
 | 
|          return false;
 | 
| @@ -1476,7 +1476,7 @@ static bool tapElement(WebView* webView, WebInputEvent::Type type, const PassRef
 | 
|  static bool tapElementById(WebView* webView, WebInputEvent::Type type, const WebString& id)
 | 
|  {
 | 
|      ASSERT(webView);
 | 
| -    RefPtrWillBeRawPtr<Element> element = static_cast<PassRefPtrWillBeRawPtr<Element>>(webView->mainFrame()->document().getElementById(id));
 | 
| +    RawPtr<Element> element = static_cast<RawPtr<Element>>(webView->mainFrame()->document().getElementById(id));
 | 
|      return tapElement(webView, type, element);
 | 
|  }
 | 
|  
 | 
| @@ -1548,7 +1548,7 @@ TEST_F(WebViewTest, ContentDetectionInIframe)
 | 
|  
 | 
|      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(webView, WebInputEvent::GestureTap, element));
 | 
|      EXPECT_TRUE(client.scheduledIntentURL() == intentURL);
 | 
|      EXPECT_FALSE(client.wasInMainFrame());
 | 
| @@ -2432,7 +2432,7 @@ TEST_F(WebViewTest, DeleteElementWithRegisteredHandler)
 | 
|      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();
 | 
|  
 | 
| 
 |