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

content/browser/geolocation/wifi_data_provider_mac.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.
 
 // For OSX 10.5 we use the system API function WirelessScanSplit. This function
 // is not documented or included in the SDK, so we use a reverse-engineered
 // header, osx_wifi_.h. This file is taken from the iStumbler project
 // (http://www.istumbler.net).
 
 #include "content/browser/geolocation/wifi_data_provider_mac.h"
 
 #include <dlfcn.h>
 #include <stdio.h>
 
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/browser/geolocation/osx_wifi.h"
 #include "content/browser/geolocation/wifi_data_provider_common.h"
 
 namespace content {
 namespace {
 // The time periods, in milliseconds, between successive polls of the wifi data.
 const int kDefaultPollingInterval = 120000;  // 2 mins
 const int kNoChangePollingInterval = 300000;  // 5 mins
 const int kTwoNoChangePollingInterval = 600000;  // 10 mins
 const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s
@@ skipping 160 matching lines @@
 }
 
 PollingPolicyInterface* MacWifiDataProvider::NewPollingPolicy() {
   return new GenericPollingPolicy<kDefaultPollingInterval,
                                   kNoChangePollingInterval,
                                   kTwoNoChangePollingInterval,
                                   kNoWifiPollingIntervalMilliseconds>;
 }
 
 }  // namespace content