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

chrome/browser/storage_monitor/portable_device_watcher_win.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.
 
 #ifndef CHROME_BROWSER_STORAGE_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_
 
 #include <portabledeviceapi.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #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 {
 class SequencedTaskRunner;
 }
 
 namespace chrome {
 
 namespace test {
 class TestPortableDeviceWatcherWin;
@@ skipping 112 matching lines @@
 
   // The notifications object to use to signal newly attached devices.
   StorageMonitor::Receiver* storage_notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(PortableDeviceWatcherWin);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_