Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print…

webkit/plugins/npapi/plugin_list_mac.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 "webkit/plugins/npapi/plugin_list.h"
 
 #import <Carbon/Carbon.h>
 #import <Foundation/Foundation.h>
 
 #include "base/file_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/native_library.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 using base::mac::ScopedCFTypeRef;
 
 namespace webkit {
 namespace npapi {
 
 namespace {
 
 void GetPluginCommonDirectory(std::vector<base::FilePath>* plugin_dirs,
                               bool user) {
@@ skipping 264 matching lines @@
 }
 
 bool PluginList::ShouldLoadPluginUsingPluginList(
     const WebPluginInfo& info,
     std::vector<webkit::WebPluginInfo>* plugins) {
   return !IsBlacklistedPlugin(info);
 }
 
 }  // namespace npapi
 }  // namespace webkit