Revert 184352

chrome/browser/history/in_memory_database.cc

 // Copyright (c) 2012 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/in_memory_database.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
@@ skipping 54 matching lines @@
 bool InMemoryDatabase::InitFromDisk(const base::FilePath& history_name) {
   if (!InitDB())
     return false;
 
   // Attach to the history database on disk.  (We can't ATTACH in the middle of
   // a transaction.)
   sql::Statement attach(GetDB().GetUniqueStatement("ATTACH ? AS history"));
 #if defined(OS_POSIX)
   attach.BindString(0, history_name.value());
 #else
-  attach.BindString(0, base::WideToUTF8(history_name.value()));
+  attach.BindString(0, WideToUTF8(history_name.value()));
 #endif
   if (!attach.Run())
     return false;
 
   // Copy URL data to memory.
   base::TimeTicks begin_load = base::TimeTicks::Now();
   if (!db_.Execute(
       "INSERT INTO urls SELECT * FROM history.urls WHERE typed_count > 0")) {
     // Unable to get data from the history database. This is OK, the file may
     // just not exist yet.
@@ skipping 56 matching lines @@
   CreateKeywordSearchTermsIndices();
 
   return true;
 }
 
 sql::Connection& InMemoryDatabase::GetDB() {
   return db_;
 }
 
 }  // namespace history