Revert 184352

chrome/browser/history/thumbnail_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/thumbnail_database.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 972 matching lines @@
     sql::Statement attach(db_.GetUniqueStatement("ATTACH ? AS new_favicons"));
     if (!attach.is_valid()) {
       // Keep the transaction open, even though we failed.
       BeginTransaction();
       return false;
     }
 
 #if defined(OS_POSIX)
     attach.BindString(0, new_db_file.value());
 #else
-    attach.BindString(0, base::WideToUTF8(new_db_file.value()));
+    attach.BindString(0, WideToUTF8(new_db_file.value()));
 #endif
 
     if (!attach.Run()) {
       BeginTransaction();
       return false;
     }
   }
 
   // Move favicons and favicon_bitmaps to new DB.
   bool successfully_moved_data =
@@ skipping 160 matching lines @@
     }
     parsing_errors |= !base::StringToInt(t.token(), &height);
     favicon_sizes->push_back(gfx::Size(width, height));
   }
 
   if (parsing_errors)
     favicon_sizes->clear();
 }
 
 }  // namespace history