Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/history/query_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class QueryParserTest : public testing::Test {
  public:
   struct TestData {
     const char* input;
     const int expected_word_count;
   };
 
@@ skipping 138 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]));
   }
 }