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

chrome/browser/geolocation/geolocation_settings_state_unittest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/geolocation/geolocation_settings_state.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 23 matching lines @@
   TestingProfile profile;
   GeolocationSettingsState state(&profile);
   GURL url_0("http://www.example.com");
 
   scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
   entry->SetURL(url_0);
   content::LoadCommittedDetails load_committed_details;
   load_committed_details.entry = entry.get();
   state.DidNavigate(load_committed_details);
 
-  HostContentSettingsMapFactory::GetForProfile(profile)->SetContentSetting(
-      ContentSettingsPattern::FromURLNoWildcard(url_0),
-      ContentSettingsPattern::FromURLNoWildcard(url_0),
-      CONTENT_SETTINGS_TYPE_GEOLOCATION,
-      std::string(),
-      CONTENT_SETTING_ALLOW);
+  HostContentSettingsMapFactory::GetForProfile(profile)
+      ->SetContentSettingDefaultScope(url_0, url_0,
+                                      CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                      std::string(), CONTENT_SETTING_ALLOW);
   state.OnGeolocationPermissionSet(url_0, true);
 
   GURL url_1("http://www.example1.com");
-  HostContentSettingsMapFactory::GetForProfile(profile)->SetContentSetting(
-    ContentSettingsPattern::FromURLNoWildcard(url_1),
-    ContentSettingsPattern::FromURLNoWildcard(url_0),
-    CONTENT_SETTINGS_TYPE_GEOLOCATION,
-    std::string(),
-    CONTENT_SETTING_BLOCK);
+  HostContentSettingsMapFactory::GetForProfile(profile)
+      ->SetContentSettingDefaultScope(url_1, url_0,
+                                      CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                      std::string(), CONTENT_SETTING_BLOCK);
   state.OnGeolocationPermissionSet(url_1, false);
 
   GeolocationSettingsState::StateMap state_map =
       state.state_map();
   EXPECT_EQ(2U, state_map.size());
 
   GeolocationSettingsState::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 70 matching lines @@
   TestingProfile profile;
   GeolocationSettingsState state(&profile);
   GURL url_0("http://www.example.com");
 
   scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
   entry->SetURL(url_0);
   content::LoadCommittedDetails load_committed_details;
   load_committed_details.entry = entry.get();
   state.DidNavigate(load_committed_details);
 
-  HostContentSettingsMapFactory::GetForProfile(profile)->SetContentSetting(
-      ContentSettingsPattern::FromURLNoWildcard(url_0),
-      ContentSettingsPattern::FromURLNoWildcard(url_0),
-      CONTENT_SETTINGS_TYPE_GEOLOCATION,
-      std::string(),
-      CONTENT_SETTING_ALLOW);
+  HostContentSettingsMapFactory::GetForProfile(profile)
+      ->SetContentSettingDefaultScope(url_0, url_0,
+                                      CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                      std::string(), CONTENT_SETTING_ALLOW);
   state.OnGeolocationPermissionSet(url_0, true);
 
   GURL url_1("https://www.example.com");
-  HostContentSettingsMapFactory::GetForProfile(profile)->SetContentSetting(
-      ContentSettingsPattern::FromURLNoWildcard(url_1),
-      ContentSettingsPattern::FromURLNoWildcard(url_0),
-      CONTENT_SETTINGS_TYPE_GEOLOCATION,
-      std::string(),
-      CONTENT_SETTING_ALLOW);
+  HostContentSettingsMapFactory::GetForProfile(profile)
+      ->SetContentSettingDefaultScope(url_1, url_0,
+                                      CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                      std::string(), CONTENT_SETTING_ALLOW);
   state.OnGeolocationPermissionSet(url_1, true);
 
   GURL url_2("http://www.example1.com");
-  HostContentSettingsMapFactory::GetForProfile(profile)->SetContentSetting(
-      ContentSettingsPattern::FromURLNoWildcard(url_2),
-      ContentSettingsPattern::FromURLNoWildcard(url_0),
-      CONTENT_SETTINGS_TYPE_GEOLOCATION,
-      std::string(),
-      CONTENT_SETTING_ALLOW);
+  HostContentSettingsMapFactory::GetForProfile(profile)
+      ->SetContentSettingDefaultScope(url_2, url_0,
+                                      CONTENT_SETTINGS_TYPE_GEOLOCATION,
+                                      std::string(), CONTENT_SETTING_ALLOW);
   state.OnGeolocationPermissionSet(url_2, true);
 
   GeolocationSettingsState::StateMap state_map =
       state.state_map();
   EXPECT_EQ(3U, state_map.size());
 
   GeolocationSettingsState::FormattedHostsPerState formatted_host_per_state;
   unsigned int tab_state_flags = 0;
   state.GetDetailedInfo(&formatted_host_per_state, &tab_state_flags);
 
@@ skipping 21 matching lines @@
             formatted_host_per_state[CONTENT_SETTING_ALLOW].count(
                 url_2.host()));
   EXPECT_EQ(1U, formatted_host_per_state[CONTENT_SETTING_BLOCK].size());
   EXPECT_EQ(1U,
             formatted_host_per_state[CONTENT_SETTING_BLOCK].count(
                 url_1.spec()));
 }
 
 
 }  // namespace