Explicitly ShutdownOnUIThread the HostContentSettingsMap when destroying the Profile.

chrome/browser/content_settings/content_settings_policy_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_policy_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/mock_settings_observer.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 17 matching lines @@
       : ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
  protected:
   MessageLoop message_loop_;
   BrowserThread ui_thread_;
 };
 
 TEST_F(PolicyDefaultProviderTest, DefaultValues) {
   TestingProfile profile;
-  PolicyDefaultProvider provider(&profile);
   TestingPrefService* prefs = profile.GetTestingPrefService();
+  PolicyDefaultProvider provider(profile.GetHostContentSettingsMap(), prefs);
 
   // By default, policies should be off.
   ASSERT_FALSE(
       provider.DefaultSettingIsManaged(CONTENT_SETTINGS_TYPE_COOKIES));
 
   // Set managed-default-content-setting through the coresponding preferences.
   prefs->SetManagedPref(prefs::kManagedDefaultCookiesSetting,
                         Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
   ASSERT_TRUE(
       provider.DefaultSettingIsManaged(CONTENT_SETTINGS_TYPE_COOKIES));
   ASSERT_EQ(CONTENT_SETTING_BLOCK,
             provider.ProvideDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES));
 
   // Remove managed-default-content-settings-preferences.
   prefs->RemoveManagedPref(prefs::kManagedDefaultCookiesSetting);
   ASSERT_FALSE(
       provider.DefaultSettingIsManaged(CONTENT_SETTINGS_TYPE_COOKIES));
+
+  provider.ShutdownOnUIThread();
 }
 
 // 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.
 TEST_F(PolicyDefaultProviderTest, ObserveManagedSettingsChange) {
   TestingProfile profile;
   MockSettingsObserver observer;
   // Make sure the content settings map exists.
   profile.GetHostContentSettingsMap();
@@ skipping 33 matching lines @@
 
 TEST_F(PolicyProviderTest, Default) {
   TestingProfile profile;
   TestingPrefService* prefs = profile.GetTestingPrefService();
 
   ListValue* value = new ListValue();
   value->Append(Value::CreateStringValue("[*.]google.com"));
   prefs->SetManagedPref(prefs::kManagedImagesBlockedForUrls,
                         value);
 
-  PolicyProvider provider(&profile, NULL);
+  PolicyProvider provider(profile.GetHostContentSettingsMap(), prefs, NULL);
 
   ContentSettingsPattern yt_url_pattern =
       ContentSettingsPattern::FromString("www.youtube.com");
   GURL youtube_url("http://www.youtube.com");
   GURL google_url("http://mail.google.com");
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             provider.GetContentSetting(
                 youtube_url, youtube_url, CONTENT_SETTINGS_TYPE_COOKIES, ""));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             provider.GetContentSetting(
                 google_url, google_url, CONTENT_SETTINGS_TYPE_IMAGES, ""));
 
   provider.SetContentSetting(
       yt_url_pattern,
       yt_url_pattern,
       CONTENT_SETTINGS_TYPE_COOKIES,
       "",
       CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             provider.GetContentSetting(
                 youtube_url, youtube_url, CONTENT_SETTINGS_TYPE_COOKIES, ""));
+
+  provider.ShutdownOnUIThread();
 }
 
 TEST_F(PolicyProviderTest, ResourceIdentifier) {
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   AutoReset<CommandLine> auto_reset(cmd, *cmd);
   cmd->AppendSwitch(switches::kEnableResourceContentSettings);
 
   TestingProfile profile;
   TestingPrefService* prefs = profile.GetTestingPrefService();
 
   ListValue* value = new ListValue();
   value->Append(Value::CreateStringValue("[*.]google.com"));
   prefs->SetManagedPref(prefs::kManagedPluginsAllowedForUrls,
                         value);
 
-  PolicyProvider provider(&profile, NULL);
+  PolicyProvider provider(profile.GetHostContentSettingsMap(), prefs, NULL);
 
   GURL youtube_url("http://www.youtube.com");
   GURL google_url("http://mail.google.com");
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             provider.GetContentSetting(
                 youtube_url,
                 youtube_url,
                 CONTENT_SETTINGS_TYPE_PLUGINS,
                 "someplugin"));
 
   // There is no policy support for resource content settings until the feature
   // is enabled by default. Resource identifiers are simply ignored by the
   // PolicyProvider.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             provider.GetContentSetting(
                 google_url,
                 google_url,
                 CONTENT_SETTINGS_TYPE_PLUGINS,
                 ""));
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             provider.GetContentSetting(
                 google_url,
                 google_url,
                 CONTENT_SETTINGS_TYPE_PLUGINS,
                 "someplugin"));
+
+  provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings