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

content/browser/geolocation/wifi_data_provider_common_win.cc

 // Copyright (c) 2010 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/browser/geolocation/wifi_data_provider_common_win.h"
 
 #include <assert.h>
 
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/browser/geolocation/device_data_provider.h"
 #include "content/browser/geolocation/wifi_data_provider_common.h"
 
 namespace content {
 
 bool ConvertToAccessPointData(const NDIS_WLAN_BSSID& data,
                               AccessPointData *access_point_data) {
   // Currently we get only MAC address, signal strength and SSID.
   // TODO(steveblock): Work out how to get age, channel and signal-to-noise.
   DCHECK(access_point_data);
@@ skipping 27 matching lines @@
       data->insert(access_point_data);
       ++found;
     }
     // Move to the next BSS ID.
     iterator += bss_id->Length;
   }
   return found;
 }
 
 }  // namespace content