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

content/renderer/android/address_detector.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 "content/renderer/android/address_detector.h"
 
 #include <bitset>
 
 #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/public/renderer/android_content_detection_prefixes.h"
 #include "net/base/escape.h"
 
 namespace {
 
 // Maximum text length to be searched for address detection.
 static const size_t kMaxAddressLength = 250;
 
 }  // anonymous namespace
@@ skipping 28 matching lines @@
     std::string* content_text) {
   if (address_parser::FindAddress(begin, end, start_pos, end_pos)) {
     content_text->assign(
         GetContentText(string16(begin + *start_pos, begin + *end_pos)));
     return true;
   }
   return false;
 }
 
 }  // namespace content