| Index: chrome/utility/media_galleries/itunes_library_parser.cc
|
| diff --git a/chrome/utility/media_galleries/itunes_library_parser.cc b/chrome/utility/media_galleries/itunes_library_parser.cc
|
| index 85871a31632c1732e39b1c349d3229b47204e2ad..aef27f7a3675f7f05c8841a24d8233199fe0a01d 100644
|
| --- a/chrome/utility/media_galleries/itunes_library_parser.cc
|
| +++ b/chrome/utility/media_galleries/itunes_library_parser.cc
|
| @@ -74,9 +74,11 @@ bool GetTrackInfoFromDict(XmlReader* reader, TrackInfo* result) {
|
| url.path().length() - 1,
|
| &decoded_location);
|
| #if defined(OS_WIN)
|
| - string16 location(decoded_location.data(), decoded_location.length());
|
| + base::string16 location(decoded_location.data(),
|
| + decoded_location.length());
|
| #else
|
| - string16 location16(decoded_location.data(), decoded_location.length());
|
| + base::string16 location16(decoded_location.data(),
|
| + decoded_location.length());
|
| std::string location = "/" + UTF16ToUTF8(location16);
|
| #endif
|
| result->location = base::FilePath(location);
|
|
|