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 269 matching lines @@
 }
 
 content::WebContents* MediaGalleriesPermissionController::WebContents() {
   return web_contents_;
 }
 
 void MediaGalleriesPermissionController::FileSelected(
     const base::FilePath& path,
     int /*index*/,
     void* /*params*/) {
-  extensions::file_system_api::SetLastChooseEntryDirectory(
-      extensions::ExtensionPrefs::Get(GetProfile()),
-      extension_->id(),
-      path);
+  // |web_contents_| is NULL in tests.
+  if (web_contents_) {

[vandebo (ex-Chrome), 2014/06/11 16:40:56]

Is this needed? Why are the existing tests ok?

[tommycli, 2014/06/11 18:17:56]

Test crashes when the controller calls GetProfile(). The other methods called by
the tests don't get the profile.

+    extensions::file_system_api::SetLastChooseEntryDirectory(
+          extensions::ExtensionPrefs::Get(GetProfile()),
+          extension_->id(),
+          path);
+  }
 
   // Try to find it in the prefs.
   MediaGalleryPrefInfo gallery;
   DCHECK(preferences_);
   bool gallery_exists = preferences_->LookUpGalleryByPath(path, &gallery);
   if (gallery_exists && !gallery.IsBlackListedType()) {
     // The prefs are in sync with |known_galleries_|, so it should exist in
     // |known_galleries_| as well. User selecting a known gallery effectively
     // just sets the gallery to permitted.
     GalleryDialogId gallery_id = GetDialogId(gallery.pref_id);
@@ skipping 10 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);
   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() {}