Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp

 /*
  * Copyright (C) 2009 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 32 matching lines @@
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/web/WebContentSecurityPolicy.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebKit.h"
 #include "public/web/WebSharedWorker.h"
 #include "public/web/WebSharedWorkerCreationErrors.h"
 #include "public/web/WebSharedWorkerRepositoryClient.h"
 #include "web/WebLocalFrameImpl.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 // Callback class that keeps the SharedWorker and WebSharedWorker objects alive while connecting.
 class SharedWorkerConnector : private WebSharedWorkerConnector::ConnectListener {
 public:
-    SharedWorkerConnector(SharedWorker* worker, const KURL& url, const String& name, WebMessagePortChannelUniquePtr channel, std::unique_ptr<WebSharedWorkerConnector> webWorkerConnector)
+    SharedWorkerConnector(SharedWorker* worker, const KURL& url, const String& name, WebMessagePortChannelUniquePtr channel, PassOwnPtr<WebSharedWorkerConnector> webWorkerConnector)
         : m_worker(worker)
         , m_url(url)
         , m_name(name)
         , m_webWorkerConnector(std::move(webWorkerConnector))
         , m_channel(std::move(channel)) { }
 
     virtual ~SharedWorkerConnector();
     void connect();
 
 private:
     // WebSharedWorkerConnector::ConnectListener overrides.
     void connected() override;
     void scriptLoadFailed() override;
 
     Persistent<SharedWorker> m_worker;
     KURL m_url;
     String m_name;
-    std::unique_ptr<WebSharedWorkerConnector> m_webWorkerConnector;
+    OwnPtr<WebSharedWorkerConnector> m_webWorkerConnector;
     WebMessagePortChannelUniquePtr m_channel;
 };
 
 SharedWorkerConnector::~SharedWorkerConnector()
 {
     m_worker->setIsBeingConnected(false);
 }
 
 void SharedWorkerConnector::connect()
 {
@@ skipping 25 matching lines @@
     DCHECK(m_client);
 
     // No nested workers (for now) - connect() should only be called from document context.
     DCHECK(worker->getExecutionContext()->isDocument());
     Document* document = toDocument(worker->getExecutionContext());
 
     // TODO(estark): this is broken, as it only uses the first header
     // when multiple might have been sent. Fix by making the
     // SharedWorkerConnector interface take a map that can contain
     // multiple headers.
-    std::unique_ptr<Vector<CSPHeaderAndType>> headers = worker->getExecutionContext()->contentSecurityPolicy()->headers();
+    OwnPtr<Vector<CSPHeaderAndType>> headers = worker->getExecutionContext()->contentSecurityPolicy()->headers();
     WebString header;
     WebContentSecurityPolicyType headerType = WebContentSecurityPolicyTypeReport;
 
     if (headers->size() > 0) {
         header = (*headers)[0].first;
         headerType = static_cast<WebContentSecurityPolicyType>((*headers)[0].second);
     }
 
     WebWorkerCreationError creationError;
     String unusedSecureContextError;
     bool isSecureContext = worker->getExecutionContext()->isSecureContext(unusedSecureContextError);
-    std::unique_ptr<WebSharedWorkerConnector> webWorkerConnector = wrapUnique(m_client->createSharedWorkerConnector(url, name, getId(document), header, headerType, worker->getExecutionContext()->securityContext().addressSpace(), isSecureContext ? WebSharedWorkerCreationContextTypeSecure : WebSharedWorkerCreationContextTypeNonsecure, &creationError));
+    OwnPtr<WebSharedWorkerConnector> webWorkerConnector = adoptPtr(m_client->createSharedWorkerConnector(url, name, getId(document), header, headerType, worker->getExecutionContext()->securityContext().addressSpace(), isSecureContext ? WebSharedWorkerCreationContextTypeSecure : WebSharedWorkerCreationContextTypeNonsecure, &creationError));
     if (creationError != WebWorkerCreationErrorNone) {
         if (creationError == WebWorkerCreationErrorURLMismatch) {
             // Existing worker does not match this url, so return an error back to the caller.
             exceptionState.throwDOMException(URLMismatchError, "The location of the SharedWorker named '" + name + "' does not exactly match the provided URL ('" + url.elidedString() + "').");
             return;
         } else if (creationError == WebWorkerCreationErrorSecureContextMismatch) {
             if (isSecureContext) {
                 UseCounter::count(document, UseCounter::NonSecureSharedWorkerAccessedFromSecureContext);
             } else {
                 UseCounter::count(document, UseCounter::SecureSharedWorkerAccessedFromNonSecureContext);
@@ skipping 12 matching lines @@
     DCHECK(m_client);
     m_client->documentDetached(getId(document));
 }
 
 SharedWorkerRepositoryClientImpl::SharedWorkerRepositoryClientImpl(WebSharedWorkerRepositoryClient* client)
     : m_client(client)
 {
 }
 
 } // namespace blink