Set custom-scoped patterns in HostContentSettingsMapTest to keep test coverage

chrome/browser/content_settings/host_content_settings_map_unittest.cc

 // Copyright (c) 2012 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 <memory>
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 283 matching lines @@
 }
 
 TEST_F(HostContentSettingsMapTest, Patterns) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
 
   GURL host1("http://example.com/");
   GURL host2("http://www.example.com/");
   GURL host3("http://example.org/");
+  ContentSettingsPattern pattern1 =
+      ContentSettingsPattern::FromString("[*.]example.com");
+  ContentSettingsPattern pattern2 =
+      ContentSettingsPattern::FromString("example.org");
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host1, host1, CONTENT_SETTINGS_TYPE_COOKIES, std::string()));
-  host_content_settings_map->SetContentSettingDefaultScope(
-      host1, GURL(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
-      CONTENT_SETTING_BLOCK);
+  host_content_settings_map->SetContentSettingCustomScope(
+      pattern1, ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_COOKIES, std::string(), CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host1, host1, CONTENT_SETTINGS_TYPE_COOKIES, std::string()));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host2, host2, CONTENT_SETTINGS_TYPE_COOKIES, std::string()));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host3, host3, CONTENT_SETTINGS_TYPE_COOKIES, std::string()));
-  host_content_settings_map->SetContentSettingDefaultScope(
-      host3, GURL(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
-      CONTENT_SETTING_BLOCK);
+  host_content_settings_map->SetContentSettingCustomScope(
+      pattern2, ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_COOKIES, std::string(), CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host3, host3, CONTENT_SETTINGS_TYPE_COOKIES, std::string()));
 }
 
 TEST_F(HostContentSettingsMapTest, Observer) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
   MockSettingsObserver observer(host_content_settings_map);
@@ skipping 232 matching lines @@
                 CONTENT_SETTINGS_TYPE_AUTOPLAY, std::string()));
   host_content_settings_map->SetContentSettingDefaultScope(
       host_ending_with_dot, GURL(), CONTENT_SETTINGS_TYPE_AUTOPLAY,
       std::string(), CONTENT_SETTING_DEFAULT);
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host_ending_with_dot, host_ending_with_dot,
                 CONTENT_SETTINGS_TYPE_AUTOPLAY, std::string()));
 }
 
 TEST_F(HostContentSettingsMapTest, NestedSettings) {

[raymes, 2016/06/20 04:43:59]

As discussed, this test is a bit confusing so maybe we should rewrite it.

I also wonder whether we should have a test that ensures that changing a setting
for one origin doesn't affect other origins (or subdomains).

[msramek, 2016/06/20 16:20:04]

Agreed.

We're currently testing that other types (GEOLOCATION in this case) are not
affected, we should also test that other unrelated URLs and domains are not.

We can also test that Pattern::FromString("a.b.example.com") does not affect
"https://b.example.com", i.e. that the two are not equivalent, but one contains
the other.

Finally, since this is about the evaluation of nested testing, we can add a test
to alternate allow and block for the same type:
Set(COOKIES, "[*.]example.com", BLOCK)
Set(COOKIES, "[*.]b.example.com", ALLOW)
Set(COOKIES, "[*.]a.b.example.com", BLOCK)
and then test "example.com", "b.example.com", "a.example.com",
"a.b.example.com", "b.b.example.com" etc.

[lshang, 2016/06/22 01:51:50]

Just to clarify, did you mean Pattern::FromString("b.example.com") won't affect
"https://a.b.example.com"? Pattern::FromString("a.b.example.com") doesn't
contain "https://b.example.com" I think.:-)
Done.

   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
 
   GURL host("http://a.b.example.com/");
-  GURL host1("http://example.com/");
-  GURL host2("http://b.example.com/");
+  ContentSettingsPattern pattern1 =
+      ContentSettingsPattern::FromString("[*.]example.com");
+  ContentSettingsPattern pattern2 =
+      ContentSettingsPattern::FromString("[*.]b.example.com");
+  ContentSettingsPattern pattern3 =
+      ContentSettingsPattern::FromString("a.b.example.com");
 
-  host_content_settings_map->SetContentSettingDefaultScope(
-      host1, GURL(), CONTENT_SETTINGS_TYPE_POPUPS, std::string(),
-      CONTENT_SETTING_BLOCK);
+  host_content_settings_map->SetContentSettingCustomScope(
+      pattern1, ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_POPUPS, std::string(), CONTENT_SETTING_BLOCK);
 
-  host_content_settings_map->SetContentSettingDefaultScope(
-      host2, GURL(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
-      CONTENT_SETTING_BLOCK);
+  host_content_settings_map->SetContentSettingCustomScope(
+      pattern2, ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_COOKIES, std::string(), CONTENT_SETTING_BLOCK);
 
-  host_content_settings_map->SetContentSettingDefaultScope(
-      host, GURL(), CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, std::string(),
+  host_content_settings_map->SetContentSettingCustomScope(
+      pattern3, ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, std::string(),
       CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,

[msramek, 2016/06/20 16:20:04]

nit: For better readability, please reorder this section to POPUPS, COOKIES,
AUTOMATIC_DOWNLOADS, JAVASCRIPT, so they're in the same order as above.

[lshang, 2016/06/22 01:51:50]

Done.
I deleted NOTIFICATIONS, FULLSCREEN, MOUSELOCK, KEYGEN and AUTOPLAY below since
we already use GEOLOCATION to test that patterns don't affect other types, I
think we don't need to list them all? 

             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_COOKIES, std::string()));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
@@ skipping 681 matching lines @@
   base::DictionaryValue test_value;
   test_value.SetString("test", "value");
   host_content_settings_map->SetWebsiteSettingDefaultScope(
       unsupported_url, unsupported_url, CONTENT_SETTINGS_TYPE_APP_BANNER,
       std::string(), base::WrapUnique(test_value.DeepCopy()));
   EXPECT_EQ(nullptr,
             host_content_settings_map->GetWebsiteSetting(
                 unsupported_url, unsupported_url,
                 CONTENT_SETTINGS_TYPE_APP_BANNER, std::string(), nullptr));
 }