Remove the use of OwnedPtrDeleter in WebMessagePortChannel.

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 38 matching lines @@
 #include "public/web/WebSharedWorker.h"
 #include "public/web/WebSharedWorkerCreationErrors.h"
 #include "public/web/WebSharedWorkerRepositoryClient.h"
 #include "web/WebLocalFrameImpl.h"
 
 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, PassOwnPtr<WebMessagePortChannel> channel, PassOwnPtr<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;
     OwnPtr<WebSharedWorkerConnector> m_webWorkerConnector;
-    OwnPtr<WebMessagePortChannel> m_channel;
+    WebMessagePortChannelUniquePtr m_channel;
 };
 
 SharedWorkerConnector::~SharedWorkerConnector()
 {
     m_worker->setIsBeingConnected(false);
 }
 
 void SharedWorkerConnector::connect()
 {
     m_worker->setIsBeingConnected(true);
-    m_webWorkerConnector->connect(m_channel.leakPtr(), this);
+    m_webWorkerConnector->connect(m_channel.release(), this);
 }
 
 void SharedWorkerConnector::connected()
 {
     // Free ourselves (this releases the SharedWorker so it can be freed as well if unreferenced).
     delete this;
 }
 
 void SharedWorkerConnector::scriptLoadFailed()
 {
     m_worker->dispatchEvent(Event::createCancelable(EventTypeNames::error));
     // Free ourselves (this releases the SharedWorker so it can be freed as well if unreferenced).
     delete this;
 }
 
 static WebSharedWorkerRepositoryClient::DocumentID getId(void* document)
 {
     DCHECK(document);
     return reinterpret_cast<WebSharedWorkerRepositoryClient::DocumentID>(document);
 }
 
-void SharedWorkerRepositoryClientImpl::connect(SharedWorker* worker, PassOwnPtr<WebMessagePortChannel> port, const KURL& url, const String& name, ExceptionState& exceptionState)
+void SharedWorkerRepositoryClientImpl::connect(SharedWorker* worker, WebMessagePortChannelUniquePtr port, const KURL& url, const String& name, ExceptionState& exceptionState)
 {
     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
@@ skipping 36 matching lines @@
     DCHECK(m_client);
     m_client->documentDetached(getId(document));
 }
 
 SharedWorkerRepositoryClientImpl::SharedWorkerRepositoryClientImpl(WebSharedWorkerRepositoryClient* client)
     : m_client(client)
 {
 }
 
 } // namespace blink