Add migration code to change existing domain scoped content settings to be origin scoped

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 "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
@@ skipping 214 matching lines @@
   // |host_settings| contains only the default setting.
   EXPECT_EQ(1U, host_settings.size());
 #if defined(ENABLE_PLUGINS)
   host_content_settings_map->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_PLUGINS, std::string(), &host_settings);
   // |host_settings| contains the default setting and an exception.
   EXPECT_EQ(2U, host_settings.size());
 #endif
 }
 
-TEST_F(HostContentSettingsMapTest, Patterns) {
+TEST_F(HostContentSettingsMapTest, Origins) {

[msramek, 2016/04/19 18:51:34]

Hmm. This test indeed doesn't test patterns anymore, but it should.

It seems that in https://codereview.chromium.org/1686343002 we removed patterns
from this test (because the HostContentSettingsMap interface stopped supporting
them), but in fact we should have just used another way of setting them (like
writing directly into the preference file), so that this test still could test
patterns. We lost that test coverage.

The same is true of NestedSettings below. Origins and NestedSettings tests are
almost equivalent right now.

(this is unrelated to this CL, I just spotted it because of this change; I can
look into that myself later)

[raymes, 2016/04/20 01:53:21]

That's a good point. We can still test patterns here by setting a custom-scoped
setting and that seems like a good idea to keep test coverage.

[lshang, 2016/06/15 06:26:41]

Yep, I've changed it back to explicitly use patterns to keep test coverage.

[lshang, 2016/06/15 06:26:41]

As above.

   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/");
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host1, host1, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
   host_content_settings_map->SetContentSettingDefaultScope(
       host1, GURL(), CONTENT_SETTINGS_TYPE_IMAGES, std::string(),
       CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host1, host1, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
+  EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host2, host2, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host3, host3, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
   host_content_settings_map->SetContentSettingDefaultScope(
       host3, GURL(), CONTENT_SETTINGS_TYPE_IMAGES, std::string(),
       CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host3, host3, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
 }
 
 TEST_F(HostContentSettingsMapTest, Observer) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
   MockSettingsObserver observer(host_content_settings_map);
 
   GURL host("http://example.com/");
   ContentSettingsPattern primary_pattern =
-      ContentSettingsPattern::FromString("[*.]example.com");
+      ContentSettingsPattern::FromString("http://example.com:80");
   ContentSettingsPattern secondary_pattern =
       ContentSettingsPattern::Wildcard();
   EXPECT_CALL(observer,
               OnContentSettingsChanged(host_content_settings_map,
                                        CONTENT_SETTINGS_TYPE_IMAGES,
                                        false,
                                        primary_pattern,
                                        secondary_pattern,
                                        false));
   host_content_settings_map->SetContentSettingDefaultScope(
@@ skipping 252 matching lines @@
   host_content_settings_map->SetContentSettingDefaultScope(
       host2, GURL(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
       CONTENT_SETTING_BLOCK);
 
   host_content_settings_map->SetContentSettingDefaultScope(
       host, GURL(), CONTENT_SETTINGS_TYPE_PLUGINS, std::string(),
       CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);
 
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
+  // Cookies and Images only take effect per-origin.

[raymes, 2016/04/20 01:53:21]

Same here, I think since this test explicitly tests patterns, we should keep
that test coverage by manually setting up the patterns.

[lshang, 2016/06/15 06:26:41]

Done.

+  EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_COOKIES, std::string()));
-  EXPECT_EQ(CONTENT_SETTING_BLOCK,
+  EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
+  // Default settings affect all sites which have no exceptions.
   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(
                 host, host, CONTENT_SETTINGS_TYPE_PLUGINS, std::string()));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
   EXPECT_EQ(CONTENT_SETTING_ASK,
@@ skipping 483 matching lines @@
 }
 
 TEST_F(HostContentSettingsMapTest, AddContentSettingsObserver) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(&profile);
   content_settings::MockObserver mock_observer;
 
   GURL host("http://example.com/");
   ContentSettingsPattern pattern =
-      ContentSettingsPattern::FromString("[*.]example.com");
+      ContentSettingsPattern::FromString("http://example.com:80");
   EXPECT_CALL(mock_observer,
               OnContentSettingChanged(pattern,
                                       ContentSettingsPattern::Wildcard(),
                                       CONTENT_SETTINGS_TYPE_IMAGES,
                                       ""));
 
   host_content_settings_map->AddObserver(&mock_observer);
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
@@ skipping 117 matching lines @@
                 host, host, CONTENT_SETTINGS_TYPE_KEYGEN, std::string()));
 
   // After migrating old settings, changes to the setting works.
   host_content_settings_map->SetContentSettingDefaultScope(
       host, GURL(), CONTENT_SETTINGS_TYPE_KEYGEN, std::string(),
       CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_KEYGEN, std::string()));
 }