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

content/renderer/hyphenator/hyphenator_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 "content/renderer/hyphenator/hyphenator.h"
 
 #include "base/path_service.h"
 #include "base/platform_file.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/common/hyphenator_messages.h"
 #include "content/public/test/mock_render_thread.h"
 #include "ipc/ipc_listener.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/hyphen/hyphen.h"
 
 namespace content {
 namespace {
 
 // A mock message listener that listens for HyphenatorHost messages. This class
@@ skipping 162 matching lines @@
   // Verify that we can now hyphenate words. When the MockListener class
   // receives a HyphenatorHostMsg_OpenDictionary message, it calls the
   // OnControlMessageReceived function with a HyphenatorMsg_SetDictionary
   // message. So, the Hyphenate function should be able to hyphenate words now.
   string16 input = ASCIIToUTF16("hyphenation");
   string16 expected = ASCIIToUTF16("hy-phen-ation");
   EXPECT_EQ(expected, Hyphenate(input));
 }
 
 }  // namespace content