Media Galleries: Allow readding blacklisted iApps libraries.

chrome/browser/media_galleries/media_galleries_permission_controller_unittest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 95 matching lines @@
   extensions::Extension* extension() {
     return extension_.get();
   }
 
   MediaGalleriesPreferences* gallery_prefs() {
     return gallery_prefs_.get();
   }
 
   GalleryDialogId GetDialogIdFromPrefId(MediaGalleryPrefId pref_id);
 
-  void TestForgottenType(MediaGalleryPrefInfo::Type type);
+  void TestForgottenType(MediaGalleryPrefInfo::Type type,
+                         bool forget_preserves_pref_id);
 
  protected:
   EnsureMediaDirectoriesExists mock_gallery_locations_;
 
  private:
   MediaGalleriesDialog* CreateMockDialog(
       MediaGalleriesDialogController* controller) {
     EXPECT_FALSE(dialog_);
     dialog_update_count_at_destruction_ = 0;
     dialog_ = new MockMediaGalleriesDialog(base::Bind(
@@ skipping 41 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPermissionControllerTest);
 };
 
 GalleryDialogId
 MediaGalleriesPermissionControllerTest::GetDialogIdFromPrefId(
     MediaGalleryPrefId pref_id) {
   return controller_->GetDialogId(pref_id);
 }
 
 void MediaGalleriesPermissionControllerTest::TestForgottenType(
-    MediaGalleryPrefInfo::Type type) {
+    MediaGalleryPrefInfo::Type type, bool forget_preserves_pref_id) {
   EXPECT_EQ(0U, gallery_prefs()->GalleriesForExtension(*extension()).size());
 
   MediaGalleryPrefId forgotten1 = gallery_prefs()->AddGalleryByPath(
       MakeMediaGalleriesTestingPath("forgotten1"), type);
   MediaGalleryPrefId forgotten2 = gallery_prefs()->AddGalleryByPath(
       MakeMediaGalleriesTestingPath("forgotten2"), type);
   // Show dialog and accept to verify 2 entries
   StartDialog();
   EXPECT_EQ(mock_gallery_locations_.num_galleries() + 2U,

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

You're going to need to rebase.

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

Done.

             controller()->GetSectionEntries(0).size());
   EXPECT_EQ(0U, controller()->GetSectionEntries(1).size());
   controller()->DidToggleEntry(GetDialogIdFromPrefId(forgotten1), true);
   controller()->DidToggleEntry(GetDialogIdFromPrefId(forgotten2), true);
   controller()->DialogFinished(true);
   EXPECT_EQ(2U, gallery_prefs()->GalleriesForExtension(*extension()).size());
 
   // Forget one and cancel to see that it's still there.
   StartDialog();
   controller()->DidForgetEntry(GetDialogIdFromPrefId(forgotten1));
   EXPECT_EQ(mock_gallery_locations_.num_galleries() + 1U,
             controller()->GetSectionEntries(0).size());
   controller()->DialogFinished(false);
   EXPECT_EQ(2U, gallery_prefs()->GalleriesForExtension(*extension()).size());
 
   // Forget one and confirm to see that it's gone.
   StartDialog();
   controller()->DidForgetEntry(GetDialogIdFromPrefId(forgotten1));
   EXPECT_EQ(mock_gallery_locations_.num_galleries() + 1U,
             controller()->GetSectionEntries(0).size());
   controller()->DialogFinished(true);
   EXPECT_EQ(1U, gallery_prefs()->GalleriesForExtension(*extension()).size());
 
+  // Add back and test whether the same pref id is preserved.
+  StartDialog();
+  controller()->FileSelected(
+      MakeMediaGalleriesTestingPath("forgotten1"), 0, NULL);
+  controller()->DialogFinished(true);
+  EXPECT_EQ(2U, gallery_prefs()->GalleriesForExtension(*extension()).size());
+  MediaGalleryPrefInfo retrieved_info;
+  EXPECT_TRUE(gallery_prefs()->LookUpGalleryByPath(
+      MakeMediaGalleriesTestingPath("forgotten1"), &retrieved_info));
+  EXPECT_EQ(forget_preserves_pref_id, retrieved_info.pref_id == forgotten1);
+
   // Add a new one and forget it & see that it's gone.
   MediaGalleryPrefId forgotten3 = gallery_prefs()->AddGalleryByPath(
       MakeMediaGalleriesTestingPath("forgotten3"), type);
   StartDialog();
-  EXPECT_EQ(mock_gallery_locations_.num_galleries() + 2U,
+  EXPECT_EQ(mock_gallery_locations_.num_galleries() + 3U,
             controller()->GetSectionEntries(0).size());
   EXPECT_EQ(0U, controller()->GetSectionEntries(1).size());
   controller()->DidToggleEntry(GetDialogIdFromPrefId(forgotten3), true);
   controller()->DidForgetEntry(GetDialogIdFromPrefId(forgotten3));
-  EXPECT_EQ(mock_gallery_locations_.num_galleries() + 1U,
+  EXPECT_EQ(mock_gallery_locations_.num_galleries() + 2U,
             controller()->GetSectionEntries(0).size());
   controller()->DialogFinished(true);
-  EXPECT_EQ(1U, gallery_prefs()->GalleriesForExtension(*extension()).size());
+  EXPECT_EQ(2U, gallery_prefs()->GalleriesForExtension(*extension()).size());
 }
 
 TEST_F(MediaGalleriesPermissionControllerTest, TestForgottenUserAdded) {
-  TestForgottenType(MediaGalleryPrefInfo::kUserAdded);
+  TestForgottenType(MediaGalleryPrefInfo::kUserAdded,
+                    false /* forget_preserves_pref_id */);
 }
 
 TEST_F(MediaGalleriesPermissionControllerTest, TestForgottenAutoDetected) {
-  TestForgottenType(MediaGalleryPrefInfo::kAutoDetected);
+  TestForgottenType(MediaGalleryPrefInfo::kAutoDetected,
+                    true /* forget_preserves_pref_id */);
 }
 
 TEST_F(MediaGalleriesPermissionControllerTest, TestForgottenScanResult) {
-  TestForgottenType(MediaGalleryPrefInfo::kScanResult);
+  TestForgottenType(MediaGalleryPrefInfo::kScanResult,
+                    true /* forget_preserves_pref_id */);
 }
 
 TEST_F(MediaGalleriesPermissionControllerTest, TestNameGeneration) {
   MediaGalleryPrefInfo gallery;
   gallery.pref_id = 1;
   gallery.device_id = StorageInfo::MakeDeviceId(
       StorageInfo::FIXED_MASS_STORAGE, "/path/to/gallery");
   gallery.type = MediaGalleryPrefInfo::kAutoDetected;
   std::string galleryName("/path/to/gallery");
 #if defined(OS_CHROMEOS)
@@ skipping 36 matching lines @@
 
   gallery.volume_label = base::string16();
   EXPECT_EQ("vendor, model", GalleryName(gallery));
 
   gallery.total_size_in_bytes = 1000000;
   EXPECT_EQ("977 KB vendor, model", GalleryName(gallery));
 
   gallery.path = base::FilePath(FILE_PATH_LITERAL("sub/path"));
   EXPECT_EQ("path - 977 KB vendor, model", GalleryName(gallery));
 }