Revert 72380 - Remove wstring from autocomplete....

chrome/test/ui/omnibox_uitest.cc

 // Copyright (c) 2011 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 <math.h>
 #include <stdio.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 34 matching lines @@
     time_squared_ = 0;
     time_sum_ = 0;
     time_min_ = 0;
     time_max_ = 0;
   }
 
   // Many times a user may enter something like "google.com". If
   // http://www.google.com/ is suggested that should be considered a match.
   // This could probably be accomplished with regex as well.  Note that this
   // method is called even when suggestion isn't a URL.
-  bool IsMatch(const string16& input_test, const string16& suggestion);
+  bool IsMatch(const std::wstring& input_test, const std::wstring& suggestion);
   // Runs a query chain. This sends each proper prefix of the input to the
   // omnibox and scores the autocompelte results returned.
-  void RunQueryChain(const string16& input_text);
+  void RunQueryChain(const std::wstring& input_text);
 };
 
-bool OmniboxTest::IsMatch(const string16& input_text,
-                          const string16& suggestion) {
+bool OmniboxTest::IsMatch(const std::wstring& input_text,
+                          const std::wstring& suggestion) {
   // This prefix list comes from the list used in history_url_provider.cc
   // with the exception of "ftp." and "www.".
-  string16 prefixes[] = {ASCIIToUTF16(""), ASCIIToUTF16("ftp://"),
-    ASCIIToUTF16("http://"), ASCIIToUTF16("https://"), ASCIIToUTF16("ftp."),
-    ASCIIToUTF16("www."), ASCIIToUTF16("ftp://www."),
-    ASCIIToUTF16("ftp://ftp."), ASCIIToUTF16("http://www."),
-    ASCIIToUTF16("https://www.")};
-  string16 postfixes[] = {ASCIIToUTF16(""), ASCIIToUTF16("/")};
+  std::wstring prefixes[] = {L"", L"ftp://", L"http://", L"https://",
+                             L"ftp.", L"www.", L"ftp://www.", L"ftp://ftp.",
+                             L"http://www.", L"https://www."};
+  std::wstring postfixes[] = {L"", L"/"};
   for (size_t i = 0; i < arraysize(prefixes); ++i) {
     for (size_t j = 0; j < arraysize(postfixes); ++j) {
       if (prefixes[i] + input_text + postfixes[j] == suggestion)
         return true;
     }
   }
   return false;
 }
 
-void OmniboxTest::RunQueryChain(const string16& input_text) {
+void OmniboxTest::RunQueryChain(const std::wstring& input_text) {
   // Get a handle on the omnibox and give it focus.
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get());
   scoped_refptr<AutocompleteEditProxy> autocomplete_edit(
       browser->GetAutocompleteEdit());
   ASSERT_TRUE(browser->ApplyAccelerator(IDC_FOCUS_LOCATION));
 
   // Try every proper prefix of input_text.  There's no use trying
@@ skipping 67 matching lines @@
       std::vector<std::string> expected_providers;
       ASSERT_TRUE(reader.NodeAttribute("query", &query));
       reader.Read();
       while (reader.SkipToElement()) {
         ASSERT_EQ("provider", reader.NodeName());
         std::string provider;
         ASSERT_TRUE(reader.NodeAttribute("provider", &provider));
         expected_providers.push_back(provider);
         reader.Read();
       }
-      RunQueryChain(ASCIIToUTF16(query));
+      RunQueryChain(ASCIIToWide(query));
       reader.Read();
     }
     reader.Read();
   }
 
   // Output results.
   ASSERT_GT(query_count_, 0);
   int64 mean = time_sum_ / query_count_;
   wprintf(L"__om_query_count = %d\n", query_count_);
   wprintf(L"__om_query_timeouts = %d\n", query_timeouts_);
   wprintf(L"__om_time_per_query_avg = %d\n", mean);
   // Use the equation stddev = sqrt(Sum(x_i^2)/N - mean^2).
   wprintf(L"__om_time_per_query_stddev = %d\n", static_cast<int64>(
       sqrt(1.0 * time_squared_ / query_count_ - mean * mean)));
   wprintf(L"__om_time_per_query_max = %d\n", time_max_);
   wprintf(L"__om_time_per_query_min = %d\n", time_min_);
   wprintf(L"__om_score = %.4f\n", 100.0 * score_ / max_score_);
 }