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

chrome/browser/history/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/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "gfx/codec/jpeg_codec.h"
 #include "googleurl/src/gurl.h"
@@ skipping 222 matching lines @@
   backend_->thumbnail_db_->SetPageThumbnail(gurl, row2_id, *weewar_bitmap,
                                             score, time);
 
   // Star row1.
   bookmark_model_.AddURL(
       bookmark_model_.GetBookmarkBarNode(), 0, std::wstring(), row1.url());
 
   // Set full text index for each one.
   backend_->text_database_->AddPageData(row1.url(), row1_id, visit1_id,
                                         row1.last_visit(),
-                                        L"Title 1", UTF8ToUTF16("Body 1"));
+                                        L"Title 1", L"Body 1");
   backend_->text_database_->AddPageData(row2.url(), row2_id, visit2_id,
                                         row2.last_visit(),
-                                        L"Title 2", UTF8ToUTF16("Body 2"));
+                                        L"Title 2", L"Body 2");
 
   // Now finally clear all history.
   backend_->DeleteAllHistory();
 
   // The first URL should be preserved but the time should be cleared.
   EXPECT_TRUE(backend_->db_->GetRowForURL(row1.url(), &outrow1));
   EXPECT_EQ(0, outrow1.visit_count());
   EXPECT_EQ(0, outrow1.typed_count());
   EXPECT_TRUE(Time() == outrow1.last_visit());
 
@@ skipping 316 matching lines @@
   // Fetch the row information about stripped url from history db.
   VisitVector visits;
   URLID row_id = backend_->db_->GetRowForURL(stripped_url, NULL);
   backend_->db_->GetVisitsForURL(row_id, &visits);
 
   // Check if stripped url is stored in database.
   ASSERT_EQ(1U, visits.size());
 }
 
 }  // namespace history