Change HostContentSettingsMap::SetContentSetting to use GURLs instead of patterns

chrome/browser/content_settings/content_settings_usages_state_unittest.cc

 // Copyright 2013 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 "components/content_settings/core/browser/content_settings_usages_state.h"
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 28 matching lines @@
         HostContentSettingsMapFactory::GetForProfile(&profile),
         type,
         prefs::kAcceptLanguages,
         profile.GetPrefs());
     GURL url_0("http://www.example.com");
 
     ContentSettingsUsagesState::CommittedDetails details =
         CreateDetailsWithURL(url_0);
     state.DidNavigate(details);
 
-    HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
-        ContentSettingsPattern::FromURLNoWildcard(url_0),
-        ContentSettingsPattern::FromURLNoWildcard(url_0),
-        type,
-        std::string(),
-        CONTENT_SETTING_ALLOW);
+    HostContentSettingsMapFactory::GetForProfile(&profile)
+        ->SetContentSettingDefaultScope(url_0, url_0, type, std::string(),
+                                        CONTENT_SETTING_ALLOW);
     state.OnPermissionSet(url_0, true);
 
     GURL url_1("http://www.example1.com");
-    HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
-        ContentSettingsPattern::FromURLNoWildcard(url_1),
-        ContentSettingsPattern::FromURLNoWildcard(url_0),
-        type,
-        std::string(),
-        CONTENT_SETTING_BLOCK);
+    HostContentSettingsMapFactory::GetForProfile(&profile)
+        ->SetContentSettingDefaultScope(url_1, url_0, type, std::string(),
+                                        CONTENT_SETTING_BLOCK);
     state.OnPermissionSet(url_1, false);
 
     ContentSettingsUsagesState::StateMap state_map =
         state.state_map();
     EXPECT_EQ(2U, state_map.size());
 
     ContentSettingsUsagesState::FormattedHostsPerState formatted_host_per_state;
     unsigned int tab_state_flags = 0;
     state.GetDetailedInfo(&formatted_host_per_state, &tab_state_flags);
     EXPECT_TRUE(tab_state_flags &
@@ skipping 71 matching lines @@
         HostContentSettingsMapFactory::GetForProfile(&profile),
         type,
         prefs::kAcceptLanguages,
         profile.GetPrefs());
     GURL url_0("http://www.example.com");
 
     ContentSettingsUsagesState::CommittedDetails details =
         CreateDetailsWithURL(url_0);
     state.DidNavigate(details);
 
-    HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
-        ContentSettingsPattern::FromURLNoWildcard(url_0),
-        ContentSettingsPattern::FromURLNoWildcard(url_0),
-        type,
-        std::string(),
-        CONTENT_SETTING_ALLOW);
+    HostContentSettingsMapFactory::GetForProfile(&profile)
+        ->SetContentSettingDefaultScope(url_0, url_0, type, std::string(),
+                                        CONTENT_SETTING_ALLOW);
     state.OnPermissionSet(url_0, true);
 
     GURL url_1("https://www.example.com");
-    HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
-        ContentSettingsPattern::FromURLNoWildcard(url_1),
-        ContentSettingsPattern::FromURLNoWildcard(url_0),
-        type,
-        std::string(),
-        CONTENT_SETTING_ALLOW);
+    HostContentSettingsMapFactory::GetForProfile(&profile)
+        ->SetContentSettingDefaultScope(url_1, url_0, type, std::string(),
+                                        CONTENT_SETTING_ALLOW);
     state.OnPermissionSet(url_1, true);
 
     GURL url_2("http://www.example1.com");
-    HostContentSettingsMapFactory::GetForProfile(&profile)->SetContentSetting(
-        ContentSettingsPattern::FromURLNoWildcard(url_2),
-        ContentSettingsPattern::FromURLNoWildcard(url_0),
-        type,
-        std::string(),
-        CONTENT_SETTING_ALLOW);
+    HostContentSettingsMapFactory::GetForProfile(&profile)
+        ->SetContentSettingDefaultScope(url_2, url_0, type, std::string(),
+                                        CONTENT_SETTING_ALLOW);
     state.OnPermissionSet(url_2, true);
 
     ContentSettingsUsagesState::StateMap state_map =
         state.state_map();
     EXPECT_EQ(3U, state_map.size());
 
     ContentSettingsUsagesState::FormattedHostsPerState formatted_host_per_state;
     unsigned int tab_state_flags = 0;
     state.GetDetailedInfo(&formatted_host_per_state, &tab_state_flags);
 
@@ skipping 41 matching lines @@
 
 TEST_F(ContentSettingsUsagesStateTests, ShowPortOnSameHostForGeolocation) {
   ShowPortOnSameHost(CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
 
 TEST_F(ContentSettingsUsagesStateTests, ShowPortOnSameHostForMidi) {
   ShowPortOnSameHost(CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
 }
 
 }  // namespace