Explicitly ShutdownOnUIThread the HostContentSettingsMap when destroying the Profile.

chrome/browser/content_settings/host_content_settings_map_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 "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/content_settings/host_content_settings_map.h"
@@ skipping 599 matching lines @@
   EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION],
             settings.settings[CONTENT_SETTINGS_TYPE_GEOLOCATION]);
   EXPECT_EQ(desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES],
             settings.settings[CONTENT_SETTINGS_TYPE_COOKIES]);
 }
 
 TEST_F(HostContentSettingsMapTest, OffTheRecord) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
-  profile.set_incognito(true);
   scoped_refptr<HostContentSettingsMap> otr_map(
-      new HostContentSettingsMap(&profile));
-  profile.set_incognito(false);
+      new HostContentSettingsMap(profile.GetPrefs(),
+                                 profile.GetExtensionService(),
+                                 true));
 
   GURL host("http://example.com/");
   ContentSettingsPattern pattern =
        ContentSettingsPattern::FromString("[*.]example.com");
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             otr_map->GetContentSetting(
@@ skipping 19 matching lines @@
   otr_map->SetContentSetting(
       pattern,
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_ALLOW);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             otr_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_IMAGES, ""));
+
+  otr_map->ShutdownOnUIThread();
 }
 
 TEST_F(HostContentSettingsMapTest, MigrateObsoletePrefs) {
   // This feature is currently behind a flag.
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   AutoReset<CommandLine> auto_reset(cmd, *cmd);
   cmd->AppendSwitch(switches::kEnableResourceContentSettings);
 
   TestingProfile profile;
   PrefService* prefs = profile.GetPrefs();
@@ skipping 577 matching lines @@
                 kAllowedSite, kFirstPartySite, true));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetCookieContentSetting(
                 kAllowedSite, kAllowedSite, false));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetCookieContentSetting(
                 kAllowedSite, kAllowedSite, true));
 }
 
 }  // namespace