iTunes file util and data provider for media galleries

chrome/browser/media_galleries/media_galleries_preferences.cc

Index: chrome/browser/media_galleries/media_galleries_preferences.cc
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc
index 574d052ed9a5371249342b12c1ba215e0b080822..1d815c5b7b992c47ea1e985a42d0c433aa9c8bc6 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -216,15 +216,10 @@ MediaGalleriesPreferences::MediaGalleriesPreferences(Profile* profile)
       profile_(profile) {
   AddDefaultGalleriesIfFreshProfile();
 
-  // TODO(vandebo) Turn this back on when the iTunes code is ready.
-  // Temporarily turned off because it adds an extra user-visible entry to the
-  // preferences that does not quite work.
-#if 0
   // Look for optional default galleries every time.
   itunes::ITunesFinder::FindITunesLibrary(
       base::Bind(&MediaGalleriesPreferences::OnITunesDeviceID,
                  weak_factory_.GetWeakPtr()));
-#endif
 
   // TODO(tommycli): Turn on when Picasa code is ready.
 #if 0
@@ -271,6 +266,7 @@ void MediaGalleriesPreferences::AddDefaultGalleriesIfFreshProfile() {
 
 void MediaGalleriesPreferences::OnITunesDeviceID(const std::string& device_id) {
   DCHECK(!device_id.empty());
+  // TODO(vandebo): Amend any existing iTunes gallery instead of adding anew.

[Lei Zhang, 2013/06/06 03:48:47]

nit: Add more context. This is for the corner case of the user changing their
iTunes folder, right?

[vandebo (ex-Chrome), 2013/06/06 19:49:18]

Done.

   AddGalleryWithName(device_id, ASCIIToUTF16(kITunesGalleryName),
                      base::FilePath(), false /*not user added*/);
 }