Add gallery permissions to Media Galleries Preferences

chrome/browser/extensions/extension_prefs_unittest.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 "extension_prefs_unittest.h"
 
 #include "base/basictypes.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
@@ skipping 86 matching lines @@
 
  private:
   Time extension_time_;
   Time blacklist_time_;
   std::string extension_id_;
 };
 TEST_F(ExtensionPrefsLastPingDay, LastPingDay) {}
 
 namespace {
 
-void AddGalleryPermission(MediaGalleryPrefId gallery, bool has_access,
-                          std::vector<MediaGalleryPermission>* vector) {
-  MediaGalleryPermission permission;
+void AddGalleryPermission(chrome::MediaGalleryPrefId gallery, bool has_access,
+                          std::vector<chrome::MediaGalleryPermission>* vector) {
+  chrome::MediaGalleryPermission permission;
   permission.pref_id = gallery;
   permission.has_permission = has_access;
   vector->push_back(permission);
 }
 
 }  // namspace
 
 // Test the MediaGalleries permissions functions.
 class MediaGalleriesPermissions : public ExtensionPrefsTest {
  public:
@@ skipping 26 matching lines @@
     Verify();
 
     prefs()->SetMediaGalleryPermission(extension3_id_, 3, true);
     AddGalleryPermission(3, true, &extension3_expectation_);
     Verify();
 
     prefs()->RemoveMediaGalleryPermissions(3);
     extension2_expectation_.erase(extension2_expectation_.begin() + 1);
     extension3_expectation_.erase(extension3_expectation_.begin());
     Verify();
+
+    prefs()->UnsetMediaGalleryPermission(extension1_id_, 1);
+    extension1_expectation_.erase(extension1_expectation_.begin());
+    Verify();
   }
 
   virtual void Verify() {
     struct TestData {
       std::string* id;
-      std::vector<MediaGalleryPermission>* expectation;
+      std::vector<chrome::MediaGalleryPermission>* expectation;
     };
 
     const TestData test_data[] = {{&extension1_id_, &extension1_expectation_},
                                   {&extension2_id_, &extension2_expectation_},
                                   {&extension3_id_, &extension3_expectation_},
                                   {&extension4_id_, &extension4_expectation_}};
     for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); i++) {
-      std::vector<MediaGalleryPermission> actual =
+      std::vector<chrome::MediaGalleryPermission> actual =
           prefs()->GetMediaGalleryPermissions(*test_data[i].id);
       EXPECT_EQ(test_data[i].expectation->size(), actual.size());
       for (size_t permission_entry = 0;
            permission_entry < test_data[i].expectation->size() &&
                permission_entry < actual.size();
            permission_entry++) {
         EXPECT_EQ(test_data[i].expectation->at(permission_entry).pref_id,
                   actual[permission_entry].pref_id);
         EXPECT_EQ(test_data[i].expectation->at(permission_entry).has_permission,
                   actual[permission_entry].has_permission);
       }
     }
   }
 
  private:
   std::string extension1_id_;
   std::string extension2_id_;
   std::string extension3_id_;
   std::string extension4_id_;
 
-  std::vector<MediaGalleryPermission> extension1_expectation_;
-  std::vector<MediaGalleryPermission> extension2_expectation_;
-  std::vector<MediaGalleryPermission> extension3_expectation_;
-  std::vector<MediaGalleryPermission> extension4_expectation_;
+  std::vector<chrome::MediaGalleryPermission> extension1_expectation_;
+  std::vector<chrome::MediaGalleryPermission> extension2_expectation_;
+  std::vector<chrome::MediaGalleryPermission> extension3_expectation_;
+  std::vector<chrome::MediaGalleryPermission> extension4_expectation_;
 };
 TEST_F(MediaGalleriesPermissions, MediaGalleries) {}
 
 // Tests the GetToolbarOrder/SetToolbarOrder functions.
 class ExtensionPrefsToolbarOrder : public ExtensionPrefsTest {
  public:
   virtual void Initialize() {
     list_.push_back(prefs_.AddExtensionAndReturnId("1"));
     list_.push_back(prefs_.AddExtensionAndReturnId("2"));
     list_.push_back(prefs_.AddExtensionAndReturnId("3"));
@@ skipping 1049 matching lines @@
     EXPECT_EQ(string16(), error16);
     EXPECT_TRUE(prefs()->UserMayModifySettings(extension_.get(), &error16));
     EXPECT_EQ(string16(), error16);
     EXPECT_FALSE(prefs()->MustRemainEnabled(extension_.get(), &error16));
     EXPECT_EQ(string16(), error16);
   }
 };
 TEST_F(ExtensionPrefsNotRequiredExtension, NotRequiredExtension) {}
 
 }  // namespace extensions