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

rlz/mac/lib/machine_id_mac.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 <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/network/IOEthernetController.h>
 #include <IOKit/network/IOEthernetInterface.h>
 #include <IOKit/network/IONetworkInterface.h>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace rlz_lib {
 
 namespace {
 
 // See http://developer.apple.com/library/mac/#technotes/tn1103/_index.html
 
 // The caller is responsible for freeing |matching_services|.
 bool FindEthernetInterfaces(io_iterator_t* matching_services) {
   base::mac::ScopedCFTypeRef<CFMutableDictionaryRef> matching_dict(
@@ skipping 109 matching lines @@
     CFRelease(serial);
   }
 
   // On windows, this is set to the volume id. Since it's not scrambled before
   // being sent, just set it to 1.
   *more_data = 1;
   return true;
 }
 
 }  // namespace rlz_lib