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

content/renderer/hyphenator/hyphenator.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/hyphenator/hyphenator.h"
 
 #include "base/files/memory_mapped_file.h"
 #include "base/logging.h"
 #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/hyphenator_messages.h"
 #include "content/public/renderer/render_thread.h"
 #include "third_party/hyphen/hyphen.h"
 #include "third_party/icu/public/common/unicode/uscript.h"
 
 namespace {
 
 // A class that converts a sequence of UTF-8 characters to UTF-16 ones and holds
 // only the length of converted UTF-16 characters. This class is used for
 // creating a mapping from the position of a UTF-8 string to a position of a
@@ skipping 239 matching lines @@
   // CanHyphenate function, e.g. WebKit does not have to hyphenate words when it
   // does not have to break text into lines.)
   if (dictionary_) {
     hnj_hyphen_free(dictionary_);
     dictionary_ = NULL;
   }
   dictionary_file_.Set(base::FdopenPlatformFile(rule_file, "r"));
 }
 
 }  // namespace content