Use a direct include of strings headers in content/browser/, part 1.

content/browser/geolocation/device_data_provider.h

 // 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.
 
 // A device data provider provides data from the device that is used by a
 // NetworkLocationProvider to obtain a position fix. This data may be either
 // cell radio data or wifi data. For a given type of data, we use a singleton
 // instance of the device data provider, which is used by multiple
 // NetworkLocationProvider objects.
 //
@@ skipping 10 matching lines @@
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_DEVICE_DATA_PROVIDER_H_
 #define CONTENT_BROWSER_GEOLOCATION_DEVICE_DATA_PROVIDER_H_
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
 // Wifi data relating to a single access point.
 struct CONTENT_EXPORT AccessPointData {
   AccessPointData();
   ~AccessPointData();
 
@@ skipping 253 matching lines @@
   scoped_refptr<DeviceDataProviderImplBase<DataType> > impl_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDataProvider);
 };
 
 typedef DeviceDataProvider<WifiData> WifiDataProvider;
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_DEVICE_DATA_PROVIDER_H_