Use a direct include of strings headers in chrome/browser/media_galleries/.

chrome/browser/media_galleries/win/portable_device_map_service.h

 // Copyright 2013 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_MEDIA_GALLERIES_WIN_PORTABLE_DEVICE_MAP_SERVICE_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_WIN_PORTABLE_DEVICE_MAP_SERVICE_H_
 
 #include <portabledeviceapi.h>
 #include <map>
 
 #include "base/lazy_instance.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/win/scoped_comptr.h"
 
 namespace chrome {
 
 // PortableDeviceMapService keeps track of initialized portable device
 // interfaces. PortableDeviceMapService owns the portable device interfaces.
 class PortableDeviceMapService {
  public:
   static PortableDeviceMapService* GetInstance();
@@ skipping 48 matching lines @@
   // Mapping of |device_location| and IPortableDevice* object.
   PortableDeviceMap device_map_;
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PortableDeviceMapService);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_WIN_PORTABLE_DEVICE_MAP_SERVICE_H_