iTunes artist, album, and track names need to be escaped for slash and colon.

chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc

Index: chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc
diff --git a/chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc b/chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc
index 8d1982ec7adec98c471813bb46a7014bfe541502..b716a9b1465287eb0d29245d81d5c91b09b5b315 100644
--- a/chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc
+++ b/chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc
@@ -398,6 +398,48 @@ class ITunesDataProviderUniqueNameTest : public ITunesDataProviderTest {
   DISALLOW_COPY_AND_ASSIGN(ITunesDataProviderUniqueNameTest);
 };
 
+class ITunesDataProviderEscapeTest : public ITunesDataProviderTest {
+ // Albums and tracks that aren't the same, but become the same after
+ // replacing bad characters are not handled properly, but that case should
+ // never happen in practice.
+ public:
+  ITunesDataProviderEscapeTest() {}
+  virtual ~ITunesDataProviderEscapeTest() {}
+
+  virtual std::vector<LibraryEntry> SetUpLibrary() OVERRIDE {
+    base::FilePath track = library_dir().AppendASCII("Track:1.mp3");
+    std::vector<LibraryEntry> entries;
+    entries.push_back(LibraryEntry("Artist:/name", "Album:name/", track));
+    entries.push_back(LibraryEntry("Artist/name", "Album:name", track));
+    entries.push_back(LibraryEntry("Artist/name", "Album:name", track));
+    return entries;
+  }
+
+  virtual void StartTest(bool parse_success) OVERRIDE {
+    EXPECT_TRUE(parse_success);
+
+    base::FilePath track =
+        library_dir().AppendASCII("Track:1.mp3").NormalizePathSeparators();
+    EXPECT_EQ(track.value(),
+              data_provider()->GetTrackLocation(
+                  "Artist__name", "Album_name_",
+                  "Track_1.mp3").NormalizePathSeparators().value());
+    EXPECT_EQ(track.value(),
+              data_provider()->GetTrackLocation(
+                  "Artist_name", "Album_name",
+                  "Track_1 (2).mp3").NormalizePathSeparators().value());
+    EXPECT_EQ(track.value(),
+              data_provider()->GetTrackLocation(
+                  "Artist_name", "Album_name",
+                  "Track_1 (3).mp3").NormalizePathSeparators().value());
+
+    TestDone();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ITunesDataProviderEscapeTest);
+};
+
 IN_PROC_BROWSER_TEST_F(ITunesDataProviderBasicTest, BasicTest) {
   RunTest();
 }
@@ -414,4 +456,8 @@ IN_PROC_BROWSER_TEST_F(ITunesDataProviderUniqueNameTest, UniqueNameTest) {
   RunTest();
 }
 
+IN_PROC_BROWSER_TEST_F(ITunesDataProviderEscapeTest, EscapeTest) {
+  RunTest();
+}
+
 }  // namespace itunes