Revert 184352

chrome/browser/history/query_parser_unittest.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 "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/query_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 21 matching lines @@
 // Basic multi-word queries, including prefix matching.
 TEST_F(QueryParserTest, SimpleQueries) {
   EXPECT_EQ("", QueryToString(" "));
   EXPECT_EQ("singleword*", QueryToString("singleword"));
   EXPECT_EQ("spacedout*", QueryToString("  spacedout "));
   EXPECT_EQ("foo* bar*", QueryToString("foo bar"));
   // Short words aren't prefix matches. For Korean Hangul
   // the minimum is 2 while for other scripts, it's 3.
   EXPECT_EQ("f b", QueryToString(" f b"));
   // KA JANG
-  EXPECT_EQ(base::WideToUTF8(L"\xAC00 \xC7A5"),
-            QueryToString(base::WideToUTF8(L" \xAC00 \xC7A5")));
+  EXPECT_EQ(WideToUTF8(L"\xAC00 \xC7A5"),
+            QueryToString(WideToUTF8(L" \xAC00 \xC7A5")));
   EXPECT_EQ("foo* bar*", QueryToString(" foo   bar "));
   // KA-JANG BICH-GO
-  EXPECT_EQ(base::WideToUTF8(L"\xAC00\xC7A5* \xBE5B\xACE0*"),
-            QueryToString(base::WideToUTF8(L"\xAC00\xC7A5 \xBE5B\xACE0")));
+  EXPECT_EQ(WideToUTF8(L"\xAC00\xC7A5* \xBE5B\xACE0*"),
+            QueryToString(WideToUTF8(L"\xAC00\xC7A5 \xBE5B\xACE0")));
 }
 
 // Quoted substring parsing.
 TEST_F(QueryParserTest, Quoted) {
   // ASCII quotes
   EXPECT_EQ("\"Quoted\"", QueryToString("\"Quoted\""));
   // Missing end quotes
   EXPECT_EQ("\"miss end\"", QueryToString("\"miss end"));
   // Missing begin quotes
   EXPECT_EQ("miss* beg*", QueryToString("miss beg\""));
@@ skipping 98 matching lines @@
     QueryParser parser;
     parser.ParseQueryWords(UTF8ToUTF16(data[i].text), &results);
     ASSERT_EQ(data[i].word_count, results.size());
     EXPECT_EQ(data[i].w1, UTF16ToUTF8(results[0]));
     if (results.size() == 2)
       EXPECT_EQ(data[i].w2, UTF16ToUTF8(results[1]));
     if (results.size() == 3)
       EXPECT_EQ(data[i].w3, UTF16ToUTF8(results[2]));
   }
 }