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

content/shell/webkit_test_platform_support_win.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/shell/webkit_test_platform_support.h"
 
 #include <iostream>
 #include <list>
 #include <string>
 #include <windows.h>
 
 #include "base/files/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 #define SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(struct_name, member) \
     offsetof(struct_name, member) + \
     (sizeof static_cast<struct_name*>(0)->member)
 #define NONCLIENTMETRICS_SIZE_PRE_VISTA \
     SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(NONCLIENTMETRICS, lfMessageFont)
 
 namespace content {
 
 namespace {
@@ skipping 76 matching lines @@
     std::cerr << *it << "\n";
   }
   return errors.empty();
 }
 
 bool WebKitTestPlatformInitialize() {
   return SetupFonts();
 }
 
 }  // namespace content