Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp

 /*
  * Copyright (C) 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 15 matching lines @@
 #include "modules/indexeddb/IDBOpenDBRequest.h"
 
 #include "bindings/core/v8/Nullable.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBDatabaseCallbacks.h"
 #include "modules/indexeddb/IDBTracing.h"
 #include "modules/indexeddb/IDBVersionChangeEvent.h"
-#include <memory>
 
 using blink::WebIDBDatabase;
 
 namespace blink {
 
 IDBOpenDBRequest* IDBOpenDBRequest::create(ScriptState* scriptState, IDBDatabaseCallbacks* callbacks, int64_t transactionId, int64_t version)
 {
     IDBOpenDBRequest* request = new IDBOpenDBRequest(scriptState, callbacks, transactionId, version);
     request->suspendIfNeeded();
     return request;
@@ skipping 25 matching lines @@
 
 void IDBOpenDBRequest::onBlocked(int64_t oldVersion)
 {
     IDB_TRACE("IDBOpenDBRequest::onBlocked()");
     if (!shouldEnqueueEvent())
         return;
     Nullable<unsigned long long> newVersionNullable = (m_version == IDBDatabaseMetadata::DefaultVersion) ? Nullable<unsigned long long>() : Nullable<unsigned long long>(m_version);
     enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::blocked, oldVersion, newVersionNullable));
 }
 
-void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata, WebIDBDataLoss dataLoss, String dataLossMessage)
+void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata, WebIDBDataLoss dataLoss, String dataLossMessage)
 {
     IDB_TRACE("IDBOpenDBRequest::onUpgradeNeeded()");
     if (m_contextStopped || !getExecutionContext()) {
-        std::unique_ptr<WebIDBDatabase> db = std::move(backend);
+        OwnPtr<WebIDBDatabase> db = std::move(backend);
         db->abort(m_transactionId);
         db->close();
         return;
     }
     if (!shouldEnqueueEvent())
         return;
 
     ASSERT(m_databaseCallbacks);
 
     IDBDatabase* idbDatabase = IDBDatabase::create(getExecutionContext(), std::move(backend), m_databaseCallbacks.release());
     idbDatabase->setMetadata(metadata);
 
     if (oldVersion == IDBDatabaseMetadata::NoVersion) {
         // This database hasn't had a version before.
         oldVersion = IDBDatabaseMetadata::DefaultVersion;
     }
     IDBDatabaseMetadata oldMetadata(metadata);
     oldMetadata.version = oldVersion;
 
     m_transaction = IDBTransaction::create(getScriptState(), m_transactionId, idbDatabase, this, oldMetadata);
     setResult(IDBAny::create(idbDatabase));
 
     if (m_version == IDBDatabaseMetadata::NoVersion)
         m_version = 1;
     enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::upgradeneeded, oldVersion, m_version, dataLoss, dataLossMessage));
 }
 
-void IDBOpenDBRequest::onSuccess(std::unique_ptr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata)
+void IDBOpenDBRequest::onSuccess(PassOwnPtr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata)
 {
     IDB_TRACE("IDBOpenDBRequest::onSuccess()");
     if (m_contextStopped || !getExecutionContext()) {
-        std::unique_ptr<WebIDBDatabase> db = std::move(backend);
+        OwnPtr<WebIDBDatabase> db = std::move(backend);
         if (db)
             db->close();
         return;
     }
     if (!shouldEnqueueEvent())
         return;
 
     IDBDatabase* idbDatabase = nullptr;
     if (resultAsAny()) {
         // Previous onUpgradeNeeded call delivered the backend.
@@ skipping 42 matching lines @@
         dequeueEvent(event);
         setResult(nullptr);
         onError(DOMException::create(AbortError, "The connection was closed."));
         return DispatchEventResult::CanceledBeforeDispatch;
     }
 
     return IDBRequest::dispatchEventInternal(event);
 }
 
 } // namespace blink