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

chrome/browser/autocomplete/history_contents_provider_unittest.cc

 // Copyright (c) 2006-2008 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_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/history_contents_provider.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 struct TestEntry {
   const char* url;
   const wchar_t* title;
-  const char* body;
+  const wchar_t* body;
 } test_entries[] = {
-  {"http://www.google.com/1", L"PAGEONE 1",   "FOO some body text"},
-  {"http://www.google.com/2", L"PAGEONE 2",   "FOO some more blah blah"},
-  {"http://www.google.com/3", L"PAGETHREE 3", "BAR some hello world for you"},
+  {"http://www.google.com/1", L"PAGEONE 1",   L"FOO some body text"},
+  {"http://www.google.com/2", L"PAGEONE 2",   L"FOO some more blah blah"},
+  {"http://www.google.com/3", L"PAGETHREE 3", L"BAR some hello world for you"},
 };
 
 class HistoryContentsProviderTest : public testing::Test,
                                     public ACProviderListener {
  public:
   HistoryContentsProviderTest()
       : ui_thread_(ChromeThread::UI, &message_loop_),
         file_thread_(ChromeThread::FILE, &message_loop_) {}
 
   void RunQuery(const AutocompleteInput& input,
@@ skipping 28 matching lines @@
       const void* id_scope = reinterpret_cast<void*>(1);
       GURL url(test_entries[i].url);
 
       // Add everything in order of time. We don't want to have a time that
       // is "right now" or it will nondeterministically appear in the results.
       Time t = Time::Now() - TimeDelta::FromDays(arraysize(test_entries) + i);
 
       history_service->AddPage(url, t, id_scope, i, GURL(),
           PageTransition::LINK, history::RedirectList(), false);
       history_service->SetPageTitle(url, test_entries[i].title);
-      history_service->SetPageContents(url, UTF8ToUTF16(test_entries[i].body));
+      history_service->SetPageContents(url, test_entries[i].body);
     }
 
     provider_ = new HistoryContentsProvider(this, profile_.get());
   }
 
   virtual void TearDown() {
     provider_ = NULL;
     profile_.reset(NULL);
   }
 
@@ skipping 94 matching lines @@
   ASSERT_EQ(2U, m3.size());
   if (bookmark_url == m3[0].destination_url) {
     EXPECT_EQ("http://www.google.com/3", m3[1].destination_url.spec());
   } else {
     EXPECT_EQ(bookmark_url, m3[1].destination_url);
     EXPECT_EQ("http://www.google.com/3", m3[0].destination_url.spec());
   }
 }
 
 }  // namespace