Use GURLs instead of patterns in SetContentSetting() in geolocation and push_messaging

chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc

Index: chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc
diff --git a/chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc b/chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc
index 68477c0db3ba7b22f632b17581d1dbcbed71fe50..14acbfa02455e4b96620e60e8e14a87ebfb2d0a6 100644
--- a/chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc
+++ b/chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc
@@ -61,20 +61,19 @@ class PushMessagingPermissionContextTest
   void SetContentSetting(Profile* profile,
                          ContentSettingsType setting,
                          ContentSetting value) {
-    // These patterns must match those in
+    // These urls must match those in
     // PermissionContextBase::UpdateContentSetting, since the tests below use
-    // this method to overwrite patterns set as a result of
+    // this method to overwrite urls set as a result of
     // PushMessagingPermissionContext::NotifyPermissionSet.
-    ContentSettingsPattern pattern_a =
-        ContentSettingsPattern::FromURLNoWildcard(GURL(kOriginA));
-    ContentSettingsPattern insecure_pattern =
-        ContentSettingsPattern::FromURLNoWildcard(GURL(kInsecureOrigin));
+    GURL url_a = GURL(kOriginA);
+    GURL insecure_url = GURL(kInsecureOrigin);
     HostContentSettingsMap* host_content_settings_map =
         HostContentSettingsMapFactory::GetForProfile(profile);
-    host_content_settings_map->SetContentSetting(pattern_a, pattern_a, setting,
-                                                 std::string(), value);
-    host_content_settings_map->SetContentSetting(
-        insecure_pattern, insecure_pattern, setting, std::string(), value);
+
+    host_content_settings_map->SetContentSettingDefaultScope(
+        url_a, url_a, setting, std::string(), value);
+    host_content_settings_map->SetContentSettingDefaultScope(
+        insecure_url, insecure_url, setting, std::string(), value);
   }
 };