Media Galleries: Allow readding blacklisted iApps libraries.

chrome/browser/media_galleries/media_galleries_permission_controller.cc

 // Copyright 2014 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_permission_controller.h"
 
 #include "base/base_paths.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 303 matching lines @@
        iter != new_galleries_.end(); ++iter) {
     if (iter->second.pref_info.path == gallery.path &&
         iter->second.pref_info.device_id == gallery.device_id) {
       iter->second.selected = true;
       dialog_->UpdateGalleries();
       return;
     }
   }
 
   // Lastly, if not found, add a new gallery to |new_galleries_|.
-  DCHECK_EQ(kInvalidMediaGalleryPrefId, gallery.pref_id);
-  gallery.pref_id = GetDialogId(kInvalidMediaGalleryPrefId);
+  // prefId == kInvalidMediaGalleryPrefId for completely new galleries.
+  // The old prefId is retained for blacklisted galleries.
+  gallery.pref_id = GetDialogId(gallery.pref_id);

[vandebo (ex-Chrome), 2014/06/10 21:57:17]

I think this fixes a bug I just introduced...  Can you add a test for this case?

[tommycli, 2014/06/10 23:59:06]

Done.

   new_galleries_[gallery.pref_id] = Entry(gallery, true);
   dialog_->UpdateGalleries();
 }
 
 void MediaGalleriesPermissionController::OnRemovableStorageAttached(
     const StorageInfo& info) {
   UpdateGalleriesOnDeviceEvent(info.device_id());
 }
 
 void MediaGalleriesPermissionController::OnRemovableStorageDetached(
@@ skipping 202 matching lines @@
 MediaGalleryPrefId
 MediaGalleriesPermissionController::DialogIdMap::GetPrefId(
     GalleryDialogId id) {
   DCHECK_LT(id, next_dialog_id_);
   return forward_mapping_[id];
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}