Make the hcsm and its providers communicate via an observer interface.

chrome/browser/content_settings/content_settings_pref_provider_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 "chrome/browser/content_settings/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
+#include "chrome/browser/content_settings/content_settings_mock_observer.h"
 #include "chrome/browser/content_settings/mock_settings_observer.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/default_pref_store.h"
 #include "chrome/browser/prefs/overlay_persistent_pref_store.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ skipping 133 matching lines @@
       BrowserThread::UI, &message_loop_) {
   }
 
  protected:
   MessageLoop message_loop_;
   BrowserThread ui_thread_;
 };
 
 TEST_F(PrefProviderTest, Observer) {
   TestingProfile profile;
-  PrefProvider pref_content_settings_provider(
-      profile.GetHostContentSettingsMap(), profile.GetPrefs(), false);
-  MockSettingsObserver observer;
+  PrefProvider pref_content_settings_provider(profile.GetPrefs(), false);
+
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
+  content_settings::MockObserver mock_observer;
+  EXPECT_CALL(mock_observer,
+              OnContentSettingChanged(pattern,
+                                      ContentSettingsPattern::Wildcard(),
+                                      CONTENT_SETTINGS_TYPE_IMAGES,
+                                      ""));
 
-  // There are two PrefProvider instances, one in the host content settings map
-  // and one instance that is created here. Setting a content setting will fire
-  // one notification. This will change the underlying preferences which will
-  // cause the second PrefProvider instance to reload these and to
-  // sync the obsolete prefences. Hence we get two more notifications which we
-  // will not get in the real world.
-  EXPECT_CALL(observer,
-              OnContentSettingsChanged(profile.GetHostContentSettingsMap(),
-                                       CONTENT_SETTINGS_TYPE_IMAGES,
-                                       false,
-                                       pattern,
-                                       ContentSettingsPattern::Wildcard(),
-                                       false));
-  EXPECT_CALL(observer,
-              OnContentSettingsChanged(profile.GetHostContentSettingsMap(),
-                                       CONTENT_SETTINGS_TYPE_DEFAULT, true,
-                                       _, _, true)).Times(2);
+  pref_content_settings_provider.AddObserver(&mock_observer);
+
   pref_content_settings_provider.SetContentSetting(
       pattern,
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_IMAGES,
       "",
       CONTENT_SETTING_ALLOW);
 
   pref_content_settings_provider.ShutdownOnUIThread();
 }
 
@@ skipping 15 matching lines @@
   Profile::RegisterUserPrefs(otr_prefs);
   browser::RegisterUserPrefs(otr_prefs);
 
   TestingProfile profile;
   TestingProfile* otr_profile = new TestingProfile;
   profile.SetOffTheRecordProfile(otr_profile);
   profile.SetPrefService(regular_prefs);
   otr_profile->set_incognito(true);
   otr_profile->SetPrefService(otr_prefs);
 
-  PrefProvider pref_content_settings_provider(
-      profile.GetHostContentSettingsMap(), regular_prefs, false);
-  PrefProvider pref_content_settings_provider_incognito(
-      otr_profile->GetHostContentSettingsMap(), otr_prefs, true);
+  PrefProvider pref_content_settings_provider(regular_prefs, false);
+  PrefProvider pref_content_settings_provider_incognito(otr_prefs, true);
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
   pref_content_settings_provider.SetContentSetting(
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_IMAGES,
       "",
       CONTENT_SETTING_ALLOW);
 
   GURL host("http://example.com/");
   // The value should of course be visible in the regular PrefProvider.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             pref_content_settings_provider.GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   // And also in the OTR version.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             pref_content_settings_provider_incognito.GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   // But the value should not be overridden in the OTR user prefs accidentally.
   EXPECT_FALSE(otr_user_prefs->IsSetInOverlay(prefs::kContentSettingsPatterns));
 
   pref_content_settings_provider.ShutdownOnUIThread();
   pref_content_settings_provider_incognito.ShutdownOnUIThread();
 }
 
 TEST_F(PrefProviderTest, Patterns) {
   TestingProfile testing_profile;
-  PrefProvider pref_content_settings_provider(
-      testing_profile.GetHostContentSettingsMap(),
-      testing_profile.GetPrefs(), false);
+  PrefProvider pref_content_settings_provider(testing_profile.GetPrefs(),
+                                              false);
 
   GURL host1("http://example.com/");
   GURL host2("http://www.example.com/");
   GURL host3("http://example.org/");
   GURL host4("file:///tmp/test.html");
   ContentSettingsPattern pattern1 =
       ContentSettingsPattern::FromString("[*.]example.com");
   ContentSettingsPattern pattern2 =
       ContentSettingsPattern::FromString("example.org");
   ContentSettingsPattern pattern3 =
@@ skipping 44 matching lines @@
   pref_content_settings_provider.ShutdownOnUIThread();
 }
 
 TEST_F(PrefProviderTest, ResourceIdentifier) {
   // This feature is currently behind a flag.
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   AutoReset<CommandLine> auto_reset(cmd, *cmd);
   cmd->AppendSwitch(switches::kEnableResourceContentSettings);
 
   TestingProfile testing_profile;
-  PrefProvider pref_content_settings_provider(
-      testing_profile.GetHostContentSettingsMap(),
-      testing_profile.GetPrefs(),
-      false);
+  PrefProvider pref_content_settings_provider(testing_profile.GetPrefs(),
+                                              false);
 
   GURL host("http://example.com/");
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
   std::string resource1("someplugin");
   std::string resource2("otherplugin");
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             pref_content_settings_provider.GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_PLUGINS, resource1));
@@ skipping 26 matching lines @@
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("http://www.example.com");
   scoped_ptr<DictionaryValue> all_settings_dictionary(new DictionaryValue());
   all_settings_dictionary->SetWithoutPathExpansion(
       pattern.ToString(), settings_dictionary);
 
   // Set Obsolete preference.
   prefs->Set(prefs::kContentSettingsPatterns, *all_settings_dictionary);
 
   // Test if single pattern settings are properly migrated.
-  content_settings::PrefProvider provider(profile.GetHostContentSettingsMap(),
-                                          prefs, false);
+  content_settings::PrefProvider provider(prefs, false);
 
   // Validate migrated preferences
   const DictionaryValue* const_all_settings_dictionary =
       prefs->GetDictionary(prefs::kContentSettingsPatternPairs);
   EXPECT_EQ(1U, const_all_settings_dictionary->size());
   EXPECT_FALSE(const_all_settings_dictionary->HasKey(pattern.ToString()));
   EXPECT_TRUE(const_all_settings_dictionary->HasKey(
       pattern.ToString() + "," +
       ContentSettingsPattern::Wildcard().ToString()));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,  provider.GetContentSetting(
       GURL("http://www.example.com"),
       GURL("http://www.example.com"),
       CONTENT_SETTINGS_TYPE_IMAGES,
       ""));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,  provider.GetContentSetting(
       GURL("http://www.example.com"),
       GURL("http://www.example.com"),
       CONTENT_SETTINGS_TYPE_POPUPS,
       ""));
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings