Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteStatement.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/webdatabase/sqlite/SQLiteStatement.h"
 
 #include "modules/webdatabase/sqlite/SQLValue.h"
 #include "platform/Logging.h"
 #include "platform/heap/SafePoint.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "wtf/Assertions.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/CString.h"
-#include <memory>
 
 // SQLite 3.6.16 makes sqlite3_prepare_v2 automatically retry preparing the statement
 // once if the database scheme has changed. We rely on this behavior.
 #if SQLITE_VERSION_NUMBER < 3006016
 #error SQLite version 3.6.16 or newer is required
 #endif
 
 namespace {
 
 // Only return error codes consistent with 3.7.6.3.
@@ skipping 49 matching lines @@
 }
 
 int SQLiteStatement::prepare()
 {
     ASSERT(!m_isPrepared);
 
     CString query = m_query.stripWhiteSpace().utf8();
 
     // Need to pass non-stack |const char*| and |sqlite3_stmt*| to avoid race
     // with Oilpan stack scanning.
-    std::unique_ptr<const char*> tail = wrapUnique(new const char*);
-    std::unique_ptr<sqlite3_stmt*> statement = wrapUnique(new sqlite3_stmt*);
+    OwnPtr<const char*> tail = adoptPtr(new const char*);
+    OwnPtr<sqlite3_stmt*> statement = adoptPtr(new sqlite3_stmt*);
     *tail = nullptr;
     *statement = nullptr;
     int error;
     {
         SafePointScope scope(BlinkGC::HeapPointersOnStack);
 
         WTF_LOG(SQLDatabase, "SQL - prepare - %s", query.data());
 
         // Pass the length of the string including the null character to sqlite3_prepare_v2;
         // this lets SQLite avoid an extra string copy.
@@ skipping 192 matching lines @@
     ASSERT(col >= 0);
     if (!m_statement)
         if (prepareAndStep() != SQLITE_ROW)
             return 0;
     if (columnCount() <= col)
         return 0;
     return sqlite3_column_int64(m_statement, col);
 }
 
 } // namespace blink