Media Galleries: Allow readding blacklisted iApps libraries.

chrome/browser/media_galleries/media_galleries_preferences.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include "base/base_paths_posix.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
@@ skipping 650 matching lines @@
   AddGallery(info.device_id(), base::FilePath(),
              MediaGalleryPrefInfo::kAutoDetected, info.storage_label(),
              info.vendor_name(), info.model_name(), info.total_size_in_bytes(),
              base::Time::Now(), 0, 0, 0);
 }
 
 bool MediaGalleriesPreferences::LookUpGalleryByPath(
     const base::FilePath& path,
     MediaGalleryPrefInfo* gallery_info) const {
   DCHECK(IsInitialized());
+
+  // First check if the path matches an imported gallery.
+  for (MediaGalleriesPrefInfoMap::const_iterator it =
+           known_galleries_.begin(); it != known_galleries_.end(); ++it) {
+    const std::string& device_id = it->second.device_id;

[vandebo (ex-Chrome), 2014/06/11 18:36:46]

If PathIndicates... checks the device type instead of DCHECKing it, this can
just be:

if (PathIndicatesIPhoto(...) || PathIndicatesITunes(...)) {
  *gallery_info = it->second
  return true;
}

[tommycli, 2014/06/11 19:26:39]

Done.

+    bool match = false;
+    if (StorageInfo::IsIPhotoDevice(device_id)) {
+      match = iapps::PathIndicatesIPhotoLibrary(device_id, path);
+    } else if (StorageInfo::IsITunesDevice(device_id)) {
+      match = iapps::PathIndicatesITunesLibrary(device_id, path);
+    }
+
+    if (match) {
+      *gallery_info = it->second;
+      return true;
+    }
+  }
+
   StorageInfo info;
   base::FilePath relative_path;
   if (!MediaStorageUtil::GetDeviceInfoFromPath(path, &info, &relative_path)) {
     if (gallery_info)
       *gallery_info = MediaGalleryPrefInfo();
     return false;
   }
 
   relative_path = relative_path.NormalizePathSeparators();
   MediaGalleryPrefIdSet galleries_on_device =
@@ skipping 557 matching lines @@
   if (extension_prefs_for_testing_)
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   DCHECK(IsInitialized());
   extension_prefs_for_testing_ = extension_prefs;
 }