Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/webdatabase/DatabaseTask.h

 /*
  * Copyright (C) 2007, 2008, 2013 Apple 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 17 matching lines @@
 
 #ifndef DatabaseTask_h
 #define DatabaseTask_h
 
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/DatabaseBasicTypes.h"
 #include "modules/webdatabase/DatabaseError.h"
 #include "modules/webdatabase/SQLTransactionBackend.h"
 #include "platform/TaskSynchronizer.h"
 #include "platform/heap/Handle.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/Threading.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
-#include <memory>
 
 namespace blink {
 
 class DatabaseTask {
     WTF_MAKE_NONCOPYABLE(DatabaseTask); USING_FAST_MALLOC(DatabaseTask);
 public:
     virtual ~DatabaseTask();
 
     void run();
 
@@ skipping 13 matching lines @@
     TaskSynchronizer* m_synchronizer;
 
 #if !LOG_DISABLED
     virtual const char* debugTaskName() const = 0;
     bool m_complete;
 #endif
 };
 
 class Database::DatabaseOpenTask final : public DatabaseTask {
 public:
-    static std::unique_ptr<DatabaseOpenTask> create(Database* db, bool setVersionInNewDatabase, TaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success)
+    static PassOwnPtr<DatabaseOpenTask> create(Database* db, bool setVersionInNewDatabase, TaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success)
     {
-        return wrapUnique(new DatabaseOpenTask(db, setVersionInNewDatabase, synchronizer, error, errorMessage, success));
+        return adoptPtr(new DatabaseOpenTask(db, setVersionInNewDatabase, synchronizer, error, errorMessage, success));
     }
 
 private:
     DatabaseOpenTask(Database*, bool setVersionInNewDatabase, TaskSynchronizer*, DatabaseError&, String& errorMessage, bool& success);
 
     void doPerformTask() override;
 #if !LOG_DISABLED
     const char* debugTaskName() const override;
 #endif
 
     bool m_setVersionInNewDatabase;
     DatabaseError& m_error;
     String& m_errorMessage;
     bool& m_success;
 };
 
 class Database::DatabaseCloseTask final : public DatabaseTask {
 public:
-    static std::unique_ptr<DatabaseCloseTask> create(Database* db, TaskSynchronizer* synchronizer)
+    static PassOwnPtr<DatabaseCloseTask> create(Database* db, TaskSynchronizer* synchronizer)
     {
-        return wrapUnique(new DatabaseCloseTask(db, synchronizer));
+        return adoptPtr(new DatabaseCloseTask(db, synchronizer));
     }
 
 private:
     DatabaseCloseTask(Database*, TaskSynchronizer*);
 
     void doPerformTask() override;
 #if !LOG_DISABLED
     const char* debugTaskName() const override;
 #endif
 };
 
 class Database::DatabaseTransactionTask final : public DatabaseTask {
 public:
     ~DatabaseTransactionTask() override;
 
     // Transaction task is never synchronous, so no 'synchronizer' parameter.
-    static std::unique_ptr<DatabaseTransactionTask> create(SQLTransactionBackend* transaction)
+    static PassOwnPtr<DatabaseTransactionTask> create(SQLTransactionBackend* transaction)
     {
-        return wrapUnique(new DatabaseTransactionTask(transaction));
+        return adoptPtr(new DatabaseTransactionTask(transaction));
     }
 
     SQLTransactionBackend* transaction() const { return m_transaction.get(); }
 
 private:
     explicit DatabaseTransactionTask(SQLTransactionBackend*);
 
     void doPerformTask() override;
     void taskCancelled() override;
 #if !LOG_DISABLED
     const char* debugTaskName() const override;
 #endif
 
     CrossThreadPersistent<SQLTransactionBackend> m_transaction;
 };
 
 class Database::DatabaseTableNamesTask final : public DatabaseTask {
 public:
-    static std::unique_ptr<DatabaseTableNamesTask> create(Database* db, TaskSynchronizer* synchronizer, Vector<String>& names)
+    static PassOwnPtr<DatabaseTableNamesTask> create(Database* db, TaskSynchronizer* synchronizer, Vector<String>& names)
     {
-        return wrapUnique(new DatabaseTableNamesTask(db, synchronizer, names));
+        return adoptPtr(new DatabaseTableNamesTask(db, synchronizer, names));
     }
 
 private:
     DatabaseTableNamesTask(Database*, TaskSynchronizer*, Vector<String>& names);
 
     void doPerformTask() override;
 #if !LOG_DISABLED
     const char* debugTaskName() const override;
 #endif
 
     Vector<String>& m_tableNames;
 };
 
 } // namespace blink
 
 #endif // DatabaseTask_h