Use a direct include of strings headers in chrome/browser/r*-s*/.

BUG=247723
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/15906011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205318 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 16 insertions, 16 deletions

diff --git a/chrome/browser/storage_monitor/image_capture_device.h b/chrome/browser/storage_monitor/image_capture_device.h
index 71d5736..0860d9d 100644
--- a/chrome/browser/storage_monitor/image_capture_device.h
+++ b/chrome/browser/storage_monitor/image_capture_device.h
@@ -15,7 +15,7 @@
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/lock.h"
 
diff --git a/chrome/browser/storage_monitor/media_storage_util.cc b/chrome/browser/storage_monitor/media_storage_util.cc
index 5661ea3..aabee8c 100644
--- a/chrome/browser/storage_monitor/media_storage_util.cc
+++ b/chrome/browser/storage_monitor/media_storage_util.cc
@@ -10,7 +10,7 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/storage_monitor/removable_device_constants.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
diff --git a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h
index d67cab2..73dfd48 100644
--- a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h
+++ b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h
@@ -8,7 +8,7 @@
 #include <map>
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
diff --git a/chrome/browser/storage_monitor/portable_device_watcher_win.cc b/chrome/browser/storage_monitor/portable_device_watcher_win.cc
index f122be9..2a2b9da 100644
--- a/chrome/browser/storage_monitor/portable_device_watcher_win.cc
+++ b/chrome/browser/storage_monitor/portable_device_watcher_win.cc
@@ -14,7 +14,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/win/scoped_co_mem.h"
diff --git a/chrome/browser/storage_monitor/portable_device_watcher_win.h b/chrome/browser/storage_monitor/portable_device_watcher_win.h
index 0768d0e..44cd80ecd 100644
--- a/chrome/browser/storage_monitor/portable_device_watcher_win.h
+++ b/chrome/browser/storage_monitor/portable_device_watcher_win.h
@@ -13,7 +13,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 
 namespace base {
diff --git a/chrome/browser/storage_monitor/removable_device_constants.h b/chrome/browser/storage_monitor/removable_device_constants.h
index 7d32c9b..c63587a 100644
--- a/chrome/browser/storage_monitor/removable_device_constants.h
+++ b/chrome/browser/storage_monitor/removable_device_constants.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_DEVICE_CONSTANTS_H_
 
 #include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "build/build_config.h"
 
 namespace chrome {
diff --git a/chrome/browser/storage_monitor/storage_info.h b/chrome/browser/storage_monitor/storage_info.h
index d24d585..907b2a9 100644
--- a/chrome/browser/storage_monitor/storage_info.h
+++ b/chrome/browser/storage_monitor/storage_info.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_INFO_H_
 
 #include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace chrome {
 
diff --git a/chrome/browser/storage_monitor/storage_monitor.h b/chrome/browser/storage_monitor/storage_monitor.h
index 976bbdd..dc49de5 100644
--- a/chrome/browser/storage_monitor/storage_monitor.h
+++ b/chrome/browser/storage_monitor/storage_monitor.h
@@ -12,7 +12,7 @@
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/observer_list_threadsafe.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 
diff --git a/chrome/browser/storage_monitor/storage_monitor_chromeos.cc b/chrome/browser/storage_monitor/storage_monitor_chromeos.cc
index 963d1e4..c61f530 100644
--- a/chrome/browser/storage_monitor/storage_monitor_chromeos.cc
+++ b/chrome/browser/storage_monitor/storage_monitor_chromeos.cc
@@ -10,9 +10,9 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/storage_monitor/media_storage_util.h"
 #include "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h"
diff --git a/chrome/browser/storage_monitor/storage_monitor_linux.cc b/chrome/browser/storage_monitor/storage_monitor_linux.cc
index 0c1a193..4fc60a2 100644
--- a/chrome/browser/storage_monitor/storage_monitor_linux.cc
+++ b/chrome/browser/storage_monitor/storage_monitor_linux.cc
@@ -18,8 +18,8 @@
 #include "base/process.h"
 #include "base/process_util.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/storage_monitor/media_storage_util.h"
 #include "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h"
diff --git a/chrome/browser/storage_monitor/test_portable_device_watcher_win.h b/chrome/browser/storage_monitor/test_portable_device_watcher_win.h
index 1cb7284..04e4342 100644
--- a/chrome/browser/storage_monitor/test_portable_device_watcher_win.h
+++ b/chrome/browser/storage_monitor/test_portable_device_watcher_win.h
@@ -10,7 +10,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "chrome/browser/storage_monitor/portable_device_watcher_win.h"
 
 namespace chrome {
diff --git a/chrome/browser/storage_monitor/test_volume_mount_watcher_win.h b/chrome/browser/storage_monitor/test_volume_mount_watcher_win.h
index 0f1d7e6..f2dcbe6 100644
--- a/chrome/browser/storage_monitor/test_volume_mount_watcher_win.h
+++ b/chrome/browser/storage_monitor/test_volume_mount_watcher_win.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/storage_monitor/volume_mount_watcher_win.h"
 
diff --git a/chrome/browser/storage_monitor/volume_mount_watcher_win.cc b/chrome/browser/storage_monitor/volume_mount_watcher_win.cc
index 4102ab2..0a9f626 100644
--- a/chrome/browser/storage_monitor/volume_mount_watcher_win.cc
+++ b/chrome/browser/storage_monitor/volume_mount_watcher_win.cc
@@ -13,9 +13,9 @@
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/time.h"
diff --git a/chrome/browser/storage_monitor/volume_mount_watcher_win.h b/chrome/browser/storage_monitor/volume_mount_watcher_win.h
index 8ed0e61..72de81a 100644
--- a/chrome/browser/storage_monitor/volume_mount_watcher_win.h
+++ b/chrome/browser/storage_monitor/volume_mount_watcher_win.h
@@ -15,7 +15,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"