Use a direct include of utf_string_conversions.h in content/.

content/common/android/address_parser_unittest.cc

 // Copyright (c) 2012 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/memory/scoped_ptr.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/common/android/address_parser.h"
 #include "content/common/android/address_parser_internal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace content::address_parser;
 using namespace content::address_parser::internal;
 
 class AddressParserTest : public testing::Test {
  public:
   AddressParserTest() {}
@@ skipping 567 matching lines @@
   EXPECT_TRUE(IsAddress("79th Street 1st Floor New York City, NY 10024-5192"));
 
   EXPECT_FALSE(ContainsAddress("123 Fake Street, Springfield, Springfield"));
   EXPECT_FALSE(ContainsAddress("999 Street Avenue, City, ZZ 98765"));
   EXPECT_FALSE(ContainsAddress("76 Here be dragons, CA 94043"));
   EXPECT_FALSE(ContainsAddress("1 This, has, too* many, lines, to, be* valid"));
   EXPECT_FALSE(ContainsAddress(
       "1 Supercalifragilisticexpialidocious is too long, CA 90000"));
   EXPECT_FALSE(ContainsAddress(""));
 }