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

chrome/browser/push_messaging/push_messaging_permission_context_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 "chrome/browser/push_messaging/push_messaging_permission_context.h"
 
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 43 matching lines @@
 
 class PushMessagingPermissionContextTest
     : public ChromeRenderViewHostTestHarness {
  public:
   PushMessagingPermissionContextTest() {}
 
  protected:
   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);
   }
 };
 
 }  // namespace
 
 TEST_F(PushMessagingPermissionContextTest, HasPermissionPrompt) {
   TestingProfile profile;
   PushMessagingPermissionContext context(&profile);
   EXPECT_EQ(CONTENT_SETTING_ASK,
             context.GetPermissionStatus(GURL(kOriginA), GURL(kOriginA)));
@@ skipping 204 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             context.GetPermissionStatus(GURL(kInsecureOrigin),
                                         GURL(kInsecureOrigin)));
 
   SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
                     CONTENT_SETTING_ASK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             context.GetPermissionStatus(GURL(kInsecureOrigin),
                                         GURL(kInsecureOrigin)));
 }