Introduce a resource identifier for content settings.

chrome/browser/cocoa/content_exceptions_window_controller_unittest.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/content_exceptions_window_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
 #include "base/ref_counted.h"
@@ skipping 94 matching lines @@
 
 // Regression test for http://crbug.com/37137
 TEST_F(ContentExceptionsWindowControllerTest, AddRemove) {
   ContentExceptionsWindowController* controller =
       GetController(CONTENT_SETTINGS_TYPE_PLUGINS);
 
   HostContentSettingsMap::SettingsForOneType settings;
 
   ClickAdd(controller);
   settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
+                                      "",
                                       &settings);
   EXPECT_EQ(0u, settings.size());
 
   ClickRemove(controller);
 
   EXPECT_FALSE([controller editingNewException]);
   [controller close];
 
   settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
+                                      "",
                                       &settings);
   EXPECT_EQ(0u, settings.size());
 }
 
 // Regression test for http://crbug.com/37137
 TEST_F(ContentExceptionsWindowControllerTest, AddRemoveAll) {
   ContentExceptionsWindowController* controller =
       GetController(CONTENT_SETTINGS_TYPE_PLUGINS);
 
   ClickAdd(controller);
   ClickRemoveAll(controller);
 
   EXPECT_FALSE([controller editingNewException]);
   [controller close];
 
   HostContentSettingsMap::SettingsForOneType settings;
   settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
+                                      "",
                                       &settings);
   EXPECT_EQ(0u, settings.size());
 }
 
 TEST_F(ContentExceptionsWindowControllerTest, Add) {
   ContentExceptionsWindowController* controller =
       GetController(CONTENT_SETTINGS_TYPE_PLUGINS);
 
   ClickAdd(controller);
   EnterText(@"addedhost\n");
 
   EXPECT_FALSE([controller editingNewException]);
   [controller close];
 
   HostContentSettingsMap::SettingsForOneType settings;
   settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
+                                      "",
                                       &settings);
   EXPECT_EQ(1u, settings.size());
   EXPECT_EQ(HostContentSettingsMap::Pattern("addedhost"), settings[0].first);
 }
 
 TEST_F(ContentExceptionsWindowControllerTest, AddEscDoesNotAdd) {
   ContentExceptionsWindowController* controller =
       GetController(CONTENT_SETTINGS_TYPE_PLUGINS);
 
   ClickAdd(controller);
   EnterText(@"addedhost");  // but do not press enter
   HitEscape(controller);
 
   HostContentSettingsMap::SettingsForOneType settings;
   settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
+                                      "",
                                       &settings);
   EXPECT_EQ(0u, settings.size());
   EXPECT_FALSE([controller editingNewException]);
 
   [controller close];
 }
 
 // Regression test for http://crbug.com/37208
 TEST_F(ContentExceptionsWindowControllerTest, AddEditAddAdd) {
   ContentExceptionsWindowController* controller =
       GetController(CONTENT_SETTINGS_TYPE_PLUGINS);
 
   ClickAdd(controller);
   EnterText(@"testtesttest");  // but do not press enter
   ClickAdd(controller);
   ClickAdd(controller);
 
   EXPECT_TRUE([controller editingNewException]);
   [controller close];
 
   HostContentSettingsMap::SettingsForOneType settings;
   settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
+                                      "",
                                       &settings);
   EXPECT_EQ(0u, settings.size());
 }
 
 TEST_F(ContentExceptionsWindowControllerTest, AddExistingEditAdd) {
   settingsMap_->SetContentSetting(HostContentSettingsMap::Pattern("myhost"),
                                   CONTENT_SETTINGS_TYPE_PLUGINS,
+                                  "",
                                   CONTENT_SETTING_BLOCK);
 
   ContentExceptionsWindowController* controller =
       GetController(CONTENT_SETTINGS_TYPE_PLUGINS);
 
   ClickAdd(controller);
   EnterText(@"myhost");  // but do not press enter
   ClickAdd(controller);
 
   EXPECT_TRUE([controller editingNewException]);
   [controller close];
 
 
   HostContentSettingsMap::SettingsForOneType settings;
   settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
+                                      "",
                                       &settings);
   EXPECT_EQ(1u, settings.size());
 }
 
 TEST_F(ContentExceptionsWindowControllerTest, AddExistingDoesNotOverwrite) {
   settingsMap_->SetContentSetting(HostContentSettingsMap::Pattern("myhost"),
                                   CONTENT_SETTINGS_TYPE_COOKIES,
+                                  "",
                                   CONTENT_SETTING_SESSION_ONLY);
 
   ContentExceptionsWindowController* controller =
       GetController(CONTENT_SETTINGS_TYPE_COOKIES);
 
   ClickAdd(controller);
   EnterText(@"myhost\n");
 
   EXPECT_FALSE([controller editingNewException]);
   [controller close];
 
   HostContentSettingsMap::SettingsForOneType settings;
   settingsMap_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_COOKIES,
+                                      "",
                                       &settings);
   EXPECT_EQ(1u, settings.size());
   EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY, settings[0].second);
 }
 
 
 }  // namespace