Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/web/AssociatedURLLoaderTest.cpp

 /*
  * Copyright (C) 2011 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 27 matching lines @@
 #include "public/platform/WebURLLoaderClient.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebURLLoaderOptions.h"
 #include "public/web/WebView.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/tests/FrameTestHelpers.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
-#include <memory>
 
 using blink::URLTestHelpers::toKURL;
 using blink::testing::runPendingTasks;
 
 namespace blink {
 
 class AssociatedURLLoaderTest : public ::testing::Test,
                                 public WebURLLoaderClient {
 public:
     AssociatedURLLoaderTest()
@@ skipping 48 matching lines @@
     {
         Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
         WebCache::clear();
     }
 
     void serveRequests()
     {
         Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
     }
 
-    std::unique_ptr<WebURLLoader> createAssociatedURLLoader(const WebURLLoaderOptions options = WebURLLoaderOptions())
+    PassOwnPtr<WebURLLoader> createAssociatedURLLoader(const WebURLLoaderOptions options = WebURLLoaderOptions())
     {
-        return wrapUnique(mainFrame()->createAssociatedURLLoader(options));
+        return adoptPtr(mainFrame()->createAssociatedURLLoader(options));
     }
 
     // WebURLLoaderClient implementation.
     void willFollowRedirect(WebURLLoader* loader, WebURLRequest& newRequest, const WebURLResponse& redirectResponse) override
     {
         m_willFollowRedirect = true;
-        EXPECT_EQ(m_expectedLoader.get(), loader);
+        EXPECT_EQ(m_expectedLoader, loader);
         EXPECT_EQ(m_expectedNewRequest.url(), newRequest.url());
         // Check that CORS simple headers are transferred to the new request.
         EXPECT_EQ(m_expectedNewRequest.httpHeaderField("accept"), newRequest.httpHeaderField("accept"));
         EXPECT_EQ(m_expectedRedirectResponse.url(), redirectResponse.url());
         EXPECT_EQ(m_expectedRedirectResponse.httpStatusCode(), redirectResponse.httpStatusCode());
         EXPECT_EQ(m_expectedRedirectResponse.mimeType(), redirectResponse.mimeType());
     }
 
     void didSendData(WebURLLoader* loader, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override
     {
         m_didSendData = true;
-        EXPECT_EQ(m_expectedLoader.get(), loader);
+        EXPECT_EQ(m_expectedLoader, loader);
     }
 
     void didReceiveResponse(WebURLLoader* loader, const WebURLResponse& response) override
     {
         m_didReceiveResponse = true;
         m_actualResponse = WebURLResponse(response);
-        EXPECT_EQ(m_expectedLoader.get(), loader);
+        EXPECT_EQ(m_expectedLoader, loader);
         EXPECT_EQ(m_expectedResponse.url(), response.url());
         EXPECT_EQ(m_expectedResponse.httpStatusCode(), response.httpStatusCode());
     }
 
     void didDownloadData(WebURLLoader* loader, int dataLength, int encodedDataLength) override
     {
         m_didDownloadData = true;
-        EXPECT_EQ(m_expectedLoader.get(), loader);
+        EXPECT_EQ(m_expectedLoader, loader);
     }
 
     void didReceiveData(WebURLLoader* loader, const char* data, int dataLength, int encodedDataLength) override
     {
         m_didReceiveData = true;
-        EXPECT_EQ(m_expectedLoader.get(), loader);
+        EXPECT_EQ(m_expectedLoader, loader);
         EXPECT_TRUE(data);
         EXPECT_GT(dataLength, 0);
     }
 
     void didReceiveCachedMetadata(WebURLLoader* loader, const char* data, int dataLength) override
     {
         m_didReceiveCachedMetadata = true;
-        EXPECT_EQ(m_expectedLoader.get(), loader);
+        EXPECT_EQ(m_expectedLoader, loader);
     }
 
     void didFinishLoading(WebURLLoader* loader, double finishTime, int64_t encodedDataLength) override
     {
         m_didFinishLoading = true;
-        EXPECT_EQ(m_expectedLoader.get(), loader);
+        EXPECT_EQ(m_expectedLoader, loader);
     }
 
     void didFail(WebURLLoader* loader, const WebURLError& error) override
     {
         m_didFail = true;
-        EXPECT_EQ(m_expectedLoader.get(), loader);
+        EXPECT_EQ(m_expectedLoader, loader);
     }
 
     void CheckMethodFails(const char* unsafeMethod)
     {
         WebURLRequest request;
         request.initialize();
         request.setURL(toKURL("http://www.test.com/success.html"));
         request.setHTTPMethod(WebString::fromUTF8(unsafeMethod));
         WebURLLoaderOptions options;
         options.untrustedHTTP = true;
@@ skipping 70 matching lines @@
         return !m_actualResponse.httpHeaderField(headerNameString).isEmpty();
     }
 
     WebFrame* mainFrame() const { return m_helper.webView()->mainFrame(); }
 
 protected:
     String m_baseFilePath;
     String m_frameFilePath;
     FrameTestHelpers::WebViewHelper m_helper;
 
-    std::unique_ptr<WebURLLoader> m_expectedLoader;
+    OwnPtr<WebURLLoader> m_expectedLoader;
     WebURLResponse m_actualResponse;
     WebURLResponse m_expectedResponse;
     WebURLRequest m_expectedNewRequest;
     WebURLResponse m_expectedRedirectResponse;
     bool m_willFollowRedirect;
     bool m_didSendData;
     bool m_didReceiveResponse;
     bool m_didDownloadData;
     bool m_didReceiveData;
     bool m_didReceiveCachedMetadata;
@@ skipping 430 matching lines @@
     m_expectedLoader->loadAsynchronously(request, this);
     serveRequests();
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
 
     EXPECT_FALSE(m_actualResponse.httpHeaderField(headerNameString).isEmpty());
 }
 
 } // namespace blink