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

chrome/browser/history/history_querying_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/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 
 // Tests the history service for querying functionality.
 
 namespace history {
 
 namespace {
 
 struct TestEntry {
   const char* url;
   const wchar_t* title;
   const int days_ago;
-  const char* body;
+  const wchar_t* body;
   Time time;  // Filled by SetUp.
 } test_entries[] = {
   // This one is visited super long ago so it will be in a different database
   // from the next appearance of it at the end.
-  {"http://example.com/", L"Other", 180, "Other"},
+  {"http://example.com/", L"Other", 180, L"Other"},
 
   // These are deliberately added out of chronological order. The history
   // service should sort them by visit time when returning query results.
   // The correct index sort order is 4 2 3 1 0.
   {"http://www.google.com/1", L"Title 1", 10,
-   "PAGEONE FOO some body text"},
+   L"PAGEONE FOO some body text"},
   {"http://www.google.com/3", L"Title 3", 8,
-   "PAGETHREE BAR some hello world for you"},
+   L"PAGETHREE BAR some hello world for you"},
   {"http://www.google.com/2", L"Title 2", 9,
-   "PAGETWO FOO some more blah blah blah"},
+   L"PAGETWO FOO some more blah blah blah"},
 
   // A more recent visit of the first one.
-  {"http://example.com/", L"Other", 6, "Other"},
+  {"http://example.com/", L"Other", 6, L"Other"},
 };
 
 // Returns true if the nth result in the given results set matches. It will
 // return false on a non-match or if there aren't enough results.
 bool NthResultIs(const QueryResults& results,
                  int n,  // Result index to check.
                  int test_entry_index) {  // Index of test_entries to compare.
   if (static_cast<int>(results.size()) <= n)
     return false;
 
@@ skipping 50 matching lines @@
 
       // We need the ID scope and page ID so that the visit tracker can find it.
       const void* id_scope = reinterpret_cast<void*>(1);
       int32 page_id = i;
       GURL url(test_entries[i].url);
 
       history_->AddPage(url, test_entries[i].time, id_scope, page_id, GURL(),
                         PageTransition::LINK, history::RedirectList(),
                         false);
       history_->SetPageTitle(url, test_entries[i].title);
-      history_->SetPageContents(url, UTF8ToUTF16(test_entries[i].body));
+      history_->SetPageContents(url, test_entries[i].body);
     }
   }
 
   virtual void TearDown() {
     if (history_.get()) {
       history_->SetOnBackendDestroyTask(new MessageLoop::QuitTask);
       history_->Cleanup();
       history_ = NULL;
       MessageLoop::current()->Run();  // Wait for the other thread.
     }
@@ skipping 214 matching lines @@
   QueryOptions options;
   QueryResults results;
 
   QueryHistory(std::wstring(L"Other"), options, &results);
   EXPECT_EQ(1, results.urls().size());
   EXPECT_TRUE(NthResultIs(results, 0, 4));
 }
 */
 
 }  // namespace history