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

chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 <stdio.h>
 
 #include "base/file_path.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/platform_thread.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/history/history.h"
@@ skipping 200 matching lines @@
     // Add enough history pages containing |kSearchText| to trigger open history
     // page url in autocomplete result.
     for (size_t i = 0; i < arraysize(kHistoryEntries); i++) {
       const TestHistoryEntry& cur = kHistoryEntries[i];
       GURL url(cur.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::FromHours(i + 1);
       history_service->AddPageWithDetails(url, cur.title, cur.visit_count,
                                           cur.typed_count, t, false);
-      history_service->SetPageContents(url, WideToUTF16(cur.body));
+      history_service->SetPageContents(url, cur.body);
       if (cur.starred) {
         bookmark_model->SetURLStarred(url, std::wstring(), true);
       }
     }
   }
 
   void SetupHostResolver() {
     for (size_t i = 0; i < arraysize(kBlockedHostnames); ++i)
       host_resolver()->AddSimulatedFailure(kBlockedHostnames[i]);
   }
@@ skipping 294 matching lines @@
       break;
   }
 
   EXPECT_NE(old_text, edit_view->GetText());
 
   // Escape shall revert back to the default match item.
   ASSERT_NO_FATAL_FAILURE(SendKey(base::VKEY_ESCAPE, false, false, false));
   EXPECT_EQ(old_text, edit_view->GetText());
   EXPECT_EQ(old_selected_line, popup_model->selected_line());
 }