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

chrome/browser/media_galleries/win/mtp_device_operations_util.h

 // Copyright (c) 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.
 
 // This file has several utility functions to open a media transfer protocol
 // (MTP) device for communication, to enumerate the device contents, to read the
 // device file object, etc. All these tasks may take an arbitary long time
 // to complete. This file segregates those functionalities and runs them
 // in the blocking pool thread rather than in the UI thread.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_WIN_MTP_DEVICE_OPERATIONS_UTIL_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_WIN_MTP_DEVICE_OPERATIONS_UTIL_H_
 
 #include <portabledeviceapi.h>
 
 #include <string>
 
 #include "base/platform_file.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome/browser/media_galleries/win/mtp_device_object_entry.h"
 
 namespace chrome {
 
 namespace media_transfer_protocol {
 
 // Opens the device for communication. |pnp_device_id| specifies the plug and
 // play device ID string. On success, returns the IPortableDevice interface.
 // On failure, returns NULL.
@@ skipping 47 matching lines @@
 // |object_name| specifies the friendly name of the object.
 string16 GetObjectIdFromName(IPortableDevice* device,
                              const string16& parent_id,
                              const string16& object_name);
 
 }  // namespace media_transfer_protocol
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_WIN_MTP_DEVICE_OPERATIONS_UTIL_H_