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

content/browser/geolocation/wifi_data_provider_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.
 
 // Windows Vista uses the Native Wifi (WLAN) API for accessing WiFi cards. See
 // http://msdn.microsoft.com/en-us/library/ms705945(VS.85).aspx. Windows XP
 // Service Pack 3 (and Windows XP Service Pack 2, if upgraded with a hot fix)
 // also support a limited version of the WLAN API. See
 // http://msdn.microsoft.com/en-us/library/bb204766.aspx. The WLAN API uses
 // wlanapi.h, which is not part of the SDK used by Gears, so is replicated
@@ skipping 10 matching lines @@
 // not to work on XP SP3. So we use WLAN on Vista, and use NDIS directly
 // otherwise.
 
 #include "content/browser/geolocation/wifi_data_provider_win.h"
 
 #include <windows.h>
 #include <winioctl.h>
 #include <wlanapi.h>
 
 #include "base/metrics/histogram.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "content/browser/geolocation/wifi_data_provider_common.h"
 #include "content/browser/geolocation/wifi_data_provider_common_win.h"
 
 // Taken from ndis.h for WinCE.
 #define NDIS_STATUS_INVALID_LENGTH   ((NDIS_STATUS)0xC0010014L)
 #define NDIS_STATUS_BUFFER_TOO_SHORT ((NDIS_STATUS)0xC0010016L)
 
 namespace content {
 namespace {
@@ skipping 589 matching lines @@
 
   if (*path->rbegin() != L'\\') {
     path->append(L"\\");
   }
   DCHECK_EQ(L'\\', *path->rbegin());
   return true;
 }
 }  // namespace
 
 }  // namespace content