Convert page contents grabbing from wide to UTF16. The current code is a bit...

chrome/browser/history/history_backend.cc

 // Copyright (c) 2010 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/history_backend.h"
 
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 745 matching lines @@
     // then these additional entries will "shadow" the originals when querying
     // for the most recent match only, and the user won't get snippets. This is
     // a very minor issue, and fixing it will make import slower, so we don't
     // bother.
     bool has_indexed = false;
     if (text_database_.get()) {
       // We do not have to make it update the visit database, below, we will
       // create the visit entry with the indexed flag set.
       has_indexed = text_database_->AddPageData(i->url(), url_id, 0,
                                                 i->last_visit(),
-                                                i->title(), std::wstring());
+                                                i->title(), string16());
     }
 
     // Make up a visit to correspond to that page.
     VisitRow visit_info(url_id, i->last_visit(), 0,
         PageTransition::LINK | PageTransition::CHAIN_START |
         PageTransition::CHAIN_END, 0);
     visit_info.is_indexed = has_indexed;
     if (!visit_database->AddVisit(&visit_info)) {
       NOTREACHED() << "Adding visit failed.";
       return;
@@ skipping 642 matching lines @@
   return true;
 }
 
 void HistoryBackend::ScheduleAutocomplete(HistoryURLProvider* provider,
                                           HistoryURLProviderParams* params) {
   // ExecuteWithDB should handle the NULL database case.
   provider->ExecuteWithDB(this, db_.get(), params);
 }
 
 void HistoryBackend::SetPageContents(const GURL& url,
-                                     const std::wstring& contents) {
+                                     const string16& contents) {
   // This is histogrammed in the text database manager.
   if (!text_database_.get())
     return;
   text_database_->AddPageContents(url, contents);
 }
 
 void HistoryBackend::SetPageThumbnail(
     const GURL& url,
     const SkBitmap& thumbnail,
     const ThumbnailScore& score) {
@@ skipping 691 matching lines @@
   return true;
 }
 
 BookmarkService* HistoryBackend::GetBookmarkService() {
   if (bookmark_service_)
     bookmark_service_->BlockTillLoaded();
   return bookmark_service_;
 }
 
 }  // namespace history