Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/content_settings/host_content_settings_map_unittest.cc

 // 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.
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
+#include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/static_cookie_policy.h"
@@ skipping 16 matching lines @@
   StubSettingsObserver() : last_notifier(NULL), counter(0) {
     registrar_.Add(this, NotificationType::CONTENT_SETTINGS_CHANGED,
                    NotificationService::AllSources());
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     ++counter;
     Source<HostContentSettingsMap> content_settings(source);
-    Details<HostContentSettingsMap::ContentSettingsDetails>
-        settings_details(details);
+    Details<ContentSettingsDetails> settings_details(details);
     last_notifier = content_settings.ptr();
     last_pattern = settings_details.ptr()->pattern();
     last_update_all = settings_details.ptr()->update_all();
     last_update_all_types = settings_details.ptr()->update_all_types();
     last_type = settings_details.ptr()->type();
     // This checks that calling a Get function from an observer doesn't
     // deadlock.
     last_notifier->GetContentSettings(GURL("http://random-hostname.com/"));
   }
 
   HostContentSettingsMap* last_notifier;
-  HostContentSettingsMap::Pattern last_pattern;
+  ContentSettingsPattern last_pattern;
   bool last_update_all;
   bool last_update_all_types;
   int counter;
   ContentSettingsType last_type;
 
  private:
   NotificationRegistrar registrar_;
 };
 
 class HostContentSettingsMapTest : public testing::Test {
@@ skipping 40 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetDefaultContentSetting(
                 CONTENT_SETTINGS_TYPE_POPUPS));
   host_content_settings_map->ResetToDefaults();
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetDefaultContentSetting(
                 CONTENT_SETTINGS_TYPE_PLUGINS));
 
   // Check returning individual settings.
   GURL host("http://example.com/");
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_DEFAULT);
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
@@ skipping 24 matching lines @@
       CONTENT_SETTING_BLOCK;
   desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION] =
       CONTENT_SETTING_ASK;
   desired_settings.settings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS] =
       CONTENT_SETTING_ASK;
   ContentSettings settings =
       host_content_settings_map->GetContentSettings(host);
   EXPECT_TRUE(SettingsEqual(desired_settings, settings));
 
   // Check returning all hosts for a setting.
-  HostContentSettingsMap::Pattern pattern2("[*.]example.org");
+  ContentSettingsPattern pattern2("[*.]example.org");
   host_content_settings_map->SetContentSetting(pattern2,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetContentSetting(pattern2,
       CONTENT_SETTINGS_TYPE_PLUGINS, "", CONTENT_SETTING_BLOCK);
   HostContentSettingsMap::SettingsForOneType host_settings;
   host_content_settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES,
                                                    "",
                                                    &host_settings);
   EXPECT_EQ(1U, host_settings.size());
   host_content_settings_map->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_PLUGINS, "", &host_settings);
   EXPECT_EQ(2U, host_settings.size());
   host_content_settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_POPUPS,
                                                    "",
                                                    &host_settings);
   EXPECT_EQ(0U, host_settings.size());
   host_content_settings_map->ResetToDefaults();
   host_content_settings_map->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_PLUGINS, "", &host_settings);
   EXPECT_EQ(0U, host_settings.size());
 
   // Check clearing one type.
-  HostContentSettingsMap::Pattern pattern3("[*.]example.net");
+  ContentSettingsPattern pattern3("[*.]example.net");
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetContentSetting(pattern2,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetContentSetting(pattern2,
       CONTENT_SETTINGS_TYPE_PLUGINS, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetContentSetting(pattern3,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->ClearSettingsForOneType(
       CONTENT_SETTINGS_TYPE_IMAGES);
   host_content_settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES,
                                                    "",
                                                    &host_settings);
   EXPECT_EQ(0U, host_settings.size());
   host_content_settings_map->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_PLUGINS, "", &host_settings);
   EXPECT_EQ(1U, host_settings.size());
 }
 
 TEST_F(HostContentSettingsMapTest, Patterns) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
 
   GURL host1("http://example.com/");
   GURL host2("http://www.example.com/");
   GURL host3("http://example.org/");
-  HostContentSettingsMap::Pattern pattern1("[*.]example.com");
-  HostContentSettingsMap::Pattern pattern2("example.org");
+  ContentSettingsPattern pattern1("[*.]example.com");
+  ContentSettingsPattern pattern2("example.org");
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host1, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   host_content_settings_map->SetContentSetting(pattern1,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host1, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host2, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host3, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   host_content_settings_map->SetContentSetting(pattern2,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host3, CONTENT_SETTINGS_TYPE_IMAGES, ""));
 }
 
-TEST_F(HostContentSettingsMapTest, PatternSupport) {
-  EXPECT_TRUE(HostContentSettingsMap::Pattern("[*.]example.com").IsValid());
-  EXPECT_TRUE(HostContentSettingsMap::Pattern("example.com").IsValid());
-  EXPECT_TRUE(HostContentSettingsMap::Pattern("192.168.0.1").IsValid());
-  EXPECT_TRUE(HostContentSettingsMap::Pattern("[::1]").IsValid());
-  EXPECT_FALSE(HostContentSettingsMap::Pattern("*example.com").IsValid());
-  EXPECT_FALSE(HostContentSettingsMap::Pattern("example.*").IsValid());
-  EXPECT_FALSE(HostContentSettingsMap::Pattern("http://example.com").IsValid());
-
-  EXPECT_TRUE(HostContentSettingsMap::Pattern("[*.]example.com").Matches(
-              GURL("http://example.com/")));
-  EXPECT_TRUE(HostContentSettingsMap::Pattern("[*.]example.com").Matches(
-              GURL("http://www.example.com/")));
-  EXPECT_TRUE(HostContentSettingsMap::Pattern("www.example.com").Matches(
-              GURL("http://www.example.com/")));
-  EXPECT_FALSE(HostContentSettingsMap::Pattern("").Matches(
-               GURL("http://www.example.com/")));
-  EXPECT_FALSE(HostContentSettingsMap::Pattern("[*.]example.com").Matches(
-               GURL("http://example.org/")));
-  EXPECT_FALSE(HostContentSettingsMap::Pattern("example.com").Matches(
-               GURL("http://example.org/")));
-}
-
-TEST_F(HostContentSettingsMapTest, CanonicalizePattern) {
-  // Basic patterns.
-  EXPECT_STREQ("[*.]ikea.com", HostContentSettingsMap::Pattern("[*.]ikea.com")
-      .CanonicalizePattern().c_str());
-  EXPECT_STREQ("example.com", HostContentSettingsMap::Pattern("example.com")
-      .CanonicalizePattern().c_str());
-  EXPECT_STREQ("192.168.1.1", HostContentSettingsMap::Pattern("192.168.1.1")
-      .CanonicalizePattern().c_str());
-  EXPECT_STREQ("[::1]", HostContentSettingsMap::Pattern("[::1]")
-      .CanonicalizePattern().c_str());
-  // IsValid returns false for file:/// patterns.
-  EXPECT_STREQ("", HostContentSettingsMap::Pattern(
-      "file:///temp/file.html").CanonicalizePattern().c_str());
-
-  // UTF-8 patterns.
-  EXPECT_STREQ("[*.]xn--ira-ppa.com", HostContentSettingsMap::Pattern(
-      "[*.]\xC4\x87ira.com").CanonicalizePattern().c_str());
-  EXPECT_STREQ("xn--ira-ppa.com", HostContentSettingsMap::Pattern(
-      "\xC4\x87ira.com").CanonicalizePattern().c_str());
-  // IsValid returns false for file:/// patterns.
-  EXPECT_STREQ("", HostContentSettingsMap::Pattern(
-      "file:///\xC4\x87ira.html").CanonicalizePattern().c_str());
-
-  // Invalid patterns.
-  EXPECT_STREQ("", HostContentSettingsMap::Pattern(
-      "*example.com").CanonicalizePattern().c_str());
-  EXPECT_STREQ("", HostContentSettingsMap::Pattern(
-      "example.*").CanonicalizePattern().c_str());
-  EXPECT_STREQ("", HostContentSettingsMap::Pattern(
-      "*\xC4\x87ira.com").CanonicalizePattern().c_str());
-  EXPECT_STREQ("", HostContentSettingsMap::Pattern(
-      "\xC4\x87ira.*").CanonicalizePattern().c_str());
-}
-
 TEST_F(HostContentSettingsMapTest, Observer) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
   StubSettingsObserver observer;
 
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_ALLOW);
   EXPECT_EQ(host_content_settings_map, observer.last_notifier);
   EXPECT_EQ(pattern, observer.last_pattern);
   EXPECT_FALSE(observer.last_update_all);
   EXPECT_FALSE(observer.last_update_all_types);
   EXPECT_EQ(1, observer.counter);
 
   host_content_settings_map->ClearSettingsForOneType(
       CONTENT_SETTINGS_TYPE_IMAGES);
@@ skipping 56 matching lines @@
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
 
   PrefService* prefs = profile.GetPrefs();
 
   // Make a copy of the default pref value so we can reset it later.
   scoped_ptr<Value> default_value(prefs->FindPreference(
       prefs::kContentSettingsPatterns)->GetValue()->DeepCopy());
 
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
   GURL host("http://example.com");
 
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_COOKIES, "", CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_COOKIES, ""));
 
   // Make a copy of the pref's new value so we can reset it later.
   scoped_ptr<Value> new_value(prefs->FindPreference(
@@ skipping 10 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_COOKIES, ""));
 }
 
 TEST_F(HostContentSettingsMapTest, HostTrimEndingDotCheck) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
 
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
   GURL host_ending_with_dot("http://example.com./");
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host_ending_with_dot, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_DEFAULT);
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host_ending_with_dot, CONTENT_SETTINGS_TYPE_IMAGES, ""));
@@ skipping 59 matching lines @@
             host_content_settings_map->GetContentSetting(
                 host_ending_with_dot, CONTENT_SETTINGS_TYPE_POPUPS, ""));
 }
 
 TEST_F(HostContentSettingsMapTest, NestedSettings) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
 
   GURL host("http://a.b.example.com/");
-  HostContentSettingsMap::Pattern pattern1("[*.]example.com");
-  HostContentSettingsMap::Pattern pattern2("[*.]b.example.com");
-  HostContentSettingsMap::Pattern pattern3("a.b.example.com");
+  ContentSettingsPattern pattern1("[*.]example.com");
+  ContentSettingsPattern pattern2("[*.]b.example.com");
+  ContentSettingsPattern pattern3("a.b.example.com");
 
   host_content_settings_map->SetContentSetting(pattern1,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetContentSetting(pattern2,
       CONTENT_SETTINGS_TYPE_COOKIES, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetContentSetting(pattern3,
       CONTENT_SETTINGS_TYPE_PLUGINS, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);
 
@@ skipping 32 matching lines @@
 TEST_F(HostContentSettingsMapTest, OffTheRecord) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
   profile.set_off_the_record(true);
   scoped_refptr<HostContentSettingsMap> otr_map(
       new HostContentSettingsMap(&profile));
   profile.set_off_the_record(false);
 
   GURL host("http://example.com/");
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             otr_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_IMAGES, ""));
 
   // Changing content settings on the main map should also affect the
   // off-the-record map.
@@ skipping 102 matching lines @@
   EXPECT_STREQ("{\"[*.]xn--ira-ppa.com\":{\"per_plugin\":{\"pluginy\":2}}}",
                prefs_as_json.c_str());
 }
 
 TEST_F(HostContentSettingsMapTest, NonDefaultSettings) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
 
   GURL host("http://example.com/");
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
 
   ContentSettings desired_settings(CONTENT_SETTING_DEFAULT);
   ContentSettings settings =
     host_content_settings_map->GetNonDefaultContentSettings(host);
   EXPECT_TRUE(SettingsEqual(desired_settings, settings));
 
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES] =
       CONTENT_SETTING_BLOCK;
   settings =
     host_content_settings_map->GetNonDefaultContentSettings(host);
   EXPECT_TRUE(SettingsEqual(desired_settings, settings));
 }
 
 TEST_F(HostContentSettingsMapTest, ResourceIdentifier) {
   // This feature is currently behind a flag.
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   AutoReset<CommandLine> auto_reset(cmd, *cmd);
   cmd->AppendSwitch(switches::kEnableResourceContentSettings);
 
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
 
   GURL host("http://example.com/");
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
   std::string resource1("someplugin");
   std::string resource2("otherplugin");
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_PLUGINS, resource1));
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_PLUGINS, resource1, CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
@@ skipping 10 matching lines @@
   cmd->AppendSwitch(switches::kEnableResourceContentSettings);
 
   TestingProfile profile;
   scoped_ptr<Value> value(base::JSONReader::Read(
       "{\"[*.]example.com\":{\"per_plugin\":{\"someplugin\":2}}}", false));
   profile.GetPrefs()->Set(prefs::kContentSettingsPatterns, *value);
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
 
   GURL host("http://example.com/");
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
   std::string resource1("someplugin");
   std::string resource2("otherplugin");
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_PLUGINS, resource1));
 
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_PLUGINS, resource1, CONTENT_SETTING_DEFAULT);
 
@@ skipping 53 matching lines @@
 }
 
 TEST_F(HostContentSettingsMapTest,
        GetNonDefaultContentSettingsIfTypeManaged) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
   TestingPrefService* prefs = profile.GetTestingPrefService();
 
   // Set pattern for JavaScript setting.
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, "", CONTENT_SETTING_BLOCK);
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetDefaultContentSetting(
                 CONTENT_SETTINGS_TYPE_JAVASCRIPT));
 
   GURL host("http://example.com/");
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
@@ skipping 14 matching lines @@
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
   TestingPrefService* prefs = profile.GetTestingPrefService();
 
   // Block all JavaScript.
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);
 
   // Set an exception to allow "[*.]example.com"
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, "", CONTENT_SETTING_ALLOW);
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetDefaultContentSetting(
                 CONTENT_SETTINGS_TYPE_JAVASCRIPT));
   GURL host("http://example.com/");
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, ""));
@@ skipping 51 matching lines @@
   StubSettingsObserver observer;
   TestingPrefService* prefs = profile.GetTestingPrefService();
 
   // TODO(markusheintz): I think it would be better to send notifications only
   // for a specific content-settings-type.
 
   // Set the managed default-content-setting.
   prefs->SetManagedPref(prefs::kManagedDefaultImagesSetting,
                         Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(host_content_settings_map, observer.last_notifier);
-  EXPECT_EQ(HostContentSettingsMap::Pattern(), observer.last_pattern);
+  EXPECT_EQ(ContentSettingsPattern(), observer.last_pattern);
   EXPECT_EQ(CONTENT_SETTINGS_TYPE_DEFAULT, observer.last_type);
   EXPECT_TRUE(observer.last_update_all);
   EXPECT_TRUE(observer.last_update_all_types);
   EXPECT_EQ(1, observer.counter);
 
   // Remove the managed default-content-setting.
   prefs->RemoveManagedPref(prefs::kManagedDefaultImagesSetting);
   EXPECT_EQ(host_content_settings_map, observer.last_notifier);
   EXPECT_EQ(CONTENT_SETTINGS_TYPE_DEFAULT, observer.last_type);
-  EXPECT_EQ(HostContentSettingsMap::Pattern(), observer.last_pattern);
+  EXPECT_EQ(ContentSettingsPattern(), observer.last_pattern);
   EXPECT_TRUE(observer.last_update_all);
   EXPECT_TRUE(observer.last_update_all_types);
   EXPECT_EQ(2, observer.counter);
 }
 
 // When a default-content-setting is set to a managed setting a
 // CONTENT_SETTINGS_CHANGED notification should be fired. The same should happen
 // if the managed setting is removed. In this test-case the actual managed
 // setting is the same. Just the managed status of the default-content-setting
 // changes.
 TEST_F(HostContentSettingsMapTest, ObserveManagedSettingsNoChange) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
   StubSettingsObserver observer;
   TestingPrefService* prefs = profile.GetTestingPrefService();
 
   // TODO(markusheintz): I think it would be better to send notifications only
   // for a specific content-settings-type.
 
   // Set the managed default-content-setting. In this case the actual setting
   // does not change.
   prefs->SetManagedPref(prefs::kManagedDefaultImagesSetting,
                         Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
   EXPECT_EQ(host_content_settings_map, observer.last_notifier);
-  EXPECT_EQ(HostContentSettingsMap::Pattern(), observer.last_pattern);
+  EXPECT_EQ(ContentSettingsPattern(), observer.last_pattern);
   EXPECT_EQ(CONTENT_SETTINGS_TYPE_DEFAULT, observer.last_type);
   EXPECT_TRUE(observer.last_update_all);
   EXPECT_TRUE(observer.last_update_all_types);
   EXPECT_EQ(1, observer.counter);
 
   // Remove the managed default-content-setting.
   prefs->RemoveManagedPref(prefs::kManagedDefaultImagesSetting);
   EXPECT_EQ(host_content_settings_map, observer.last_notifier);
   EXPECT_EQ(CONTENT_SETTINGS_TYPE_DEFAULT, observer.last_type);
-  EXPECT_EQ(HostContentSettingsMap::Pattern(), observer.last_pattern);
+  EXPECT_EQ(ContentSettingsPattern(), observer.last_pattern);
   EXPECT_TRUE(observer.last_update_all);
   EXPECT_TRUE(observer.last_update_all_types);
   EXPECT_EQ(2, observer.counter);
 }
 
 // If a setting for a default-content-setting-type is set while the type is
 // managed, then the new setting should be preserved and used after the
 // default-content-setting-type is not managed anymore.
 TEST_F(HostContentSettingsMapTest, SettingDefaultContentSettingsWhenManaged) {
   TestingProfile profile;
@@ skipping 41 matching lines @@
   EXPECT_TRUE(host_content_settings_map->BlockThirdPartyCookies());
 
   // After unsetting the managed value for the preference BlockThirdPartyCookies
   // the default value should be returned now.
   prefs->RemoveManagedPref(prefs::kBlockThirdPartyCookies);
   EXPECT_FALSE(host_content_settings_map->IsBlockThirdPartyCookiesManaged());
   EXPECT_FALSE(host_content_settings_map->BlockThirdPartyCookies());
 }
 
 }  // namespace