Unbreak unit tests. Revert r7564.

chrome/browser/history/download_database.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/history/download_database.h"
 
 #include <limits>
 #include <vector>
 
 #include "chrome/browser/download/download_manager.h"
@@ skipping 51 matching lines @@
       "SELECT id, full_path, url, start_time, received_bytes, "
         "total_bytes, state "
       "FROM downloads "
       "ORDER BY start_time");
   if (!statement.is_valid())
     return;
 
   while (statement->step() == SQLITE_ROW) {
     DownloadCreateInfo info;
     info.db_handle = statement->column_int64(0);
-    std::wstring path_str = info.path.ToWStringHack();
-    statement->column_string16(1, &path_str);
+    statement->column_string16(1, &info.path);
     statement->column_string16(2, &info.url);
     info.start_time = Time::FromTimeT(statement->column_int64(3));
     info.received_bytes = statement->column_int64(4);
     info.total_bytes = statement->column_int64(5);
     info.state = statement->column_int(6);
     results->push_back(info);
   }
 }
 
 bool DownloadDatabase::UpdateDownload(int64 received_bytes,
@@ skipping 27 matching lines @@
 }
 
 int64 DownloadDatabase::CreateDownload(const DownloadCreateInfo& info) {
   SQLITE_UNIQUE_STATEMENT(statement, GetStatementCache(),
       "INSERT INTO downloads "
       "(full_path, url, start_time, received_bytes, total_bytes, state) "
       "VALUES (?, ?, ?, ?, ?, ?)");
   if (!statement.is_valid())
     return 0;
 
-  statement->bind_wstring(0, info.path.ToWStringHack());
+  statement->bind_wstring(0, info.path);
   statement->bind_wstring(1, info.url);
   statement->bind_int64(2, info.start_time.ToTimeT());
   statement->bind_int64(3, info.received_bytes);
   statement->bind_int64(4, info.total_bytes);
   statement->bind_int(5, info.state);
   if (statement->step() == SQLITE_DONE)
     return sqlite3_last_insert_rowid(GetDB());
 
   return 0;
 }
@@ skipping 39 matching lines @@
   text.append(search_text);
   text.append(L"%");
   statement->bind_wstring(0, text);
   statement->bind_wstring(1, text);
 
   while (statement->step() == SQLITE_ROW)
     results->push_back(statement->column_int64(0));
 }
 
 }  // namespace history