Revert 49594 - Convert page contents grabbing from wide to UTF16. The current...

chrome/browser/history/expire_history_backend_unittest.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/archived_database.h"
 #include "chrome/browser/history/expire_history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/text_database_manager.h"
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
@@ skipping 214 matching lines @@
   main_db_->AddVisit(&visit_row3);
 
   VisitRow visit_row4;
   visit_row4.url_id = url_ids[2];
   visit_row4.visit_time = visit_times[3];
   visit_row4.is_indexed = true;
   main_db_->AddVisit(&visit_row4);
 
   // Full text index for each visit.
   text_db_->AddPageData(url_row1.url(), visit_row1.url_id, visit_row1.visit_id,
-                        visit_row1.visit_time, L"title", UTF8ToUTF16("body"));
+                        visit_row1.visit_time, L"title", L"body");
 
   text_db_->AddPageData(url_row2.url(), visit_row2.url_id, visit_row2.visit_id,
-                        visit_row2.visit_time, L"title", UTF8ToUTF16("body"));
+                        visit_row2.visit_time, L"title", L"body");
   text_db_->AddPageData(url_row2.url(), visit_row3.url_id, visit_row3.visit_id,
-                        visit_row3.visit_time, L"title", UTF8ToUTF16("body"));
+                        visit_row3.visit_time, L"title", L"body");
 
   // Note the special text in this URL. We'll search the file for this string
   // to make sure it doesn't hang around after the delete.
   text_db_->AddPageData(url_row3.url(), visit_row4.url_id, visit_row4.visit_id,
-                        visit_row4.visit_time, L"title",
-                        UTF8ToUTF16("goats body"));
+                        visit_row4.visit_time, L"title", L"goats body");
 }
 
 bool ExpireHistoryTest::HasFavIcon(FavIconID favicon_id) {
   if (!thumb_db_.get())
     return false;
   Time last_updated;
   std::vector<unsigned char> icon_data_unused;
   GURL icon_url;
   return thumb_db_->GetFavIcon(favicon_id, &last_updated, &icon_data_unused,
                                &icon_url);
@@ skipping 531 matching lines @@
   EXPECT_TRUE(all->Read(now, main_db_.get(), &visits, 1));
   EXPECT_EQ(1U, visits.size());
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistant FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history