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

content/browser/webui/web_ui_message_handler_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/public/browser/web_ui_message_handler.h"
 
 #include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 TEST(WebUIMessageHandlerTest, ExtractIntegerValue) {
   ListValue list;
   int value, zero_value = 0, neg_value = -1234, pos_value = 1234;
   string16 zero_string(UTF8ToUTF16("0"));
   string16 neg_string(UTF8ToUTF16("-1234"));
@@ skipping 69 matching lines @@
 TEST(WebUIMessageHandlerTest, ExtractStringValue) {
   base::ListValue list;
   string16 in_string(UTF8ToUTF16(
       "The facts, though interesting, are irrelevant."));
   list.Append(new base::StringValue(in_string));
   string16 out_string = WebUIMessageHandler::ExtractStringValue(&list);
   EXPECT_EQ(in_string, out_string);
 }
 
 }  // namespace content