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

content/common/mac/attributed_string_coder.mm

 // 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/common/mac/attributed_string_coder.h"
 
 #include <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_utils.h"
 
 namespace mac {
 
 // static
 const AttributedStringCoder::EncodedString* AttributedStringCoder::Encode(
     NSAttributedString* str) {
   // Create the return value.
@@ skipping 139 matching lines @@
     *p = AttributedStringCoder::FontAttribute(font, range);
   }
   return success;
 }
 
 void ParamTraits<AttributedStringCoder::FontAttribute>::Log(
     const param_type& p, std::string* l) {
 }
 
 }  // namespace IPC