HostContentSettingsMap refactoring.

chrome/browser/profiles/profile.cc

Index: chrome/browser/profiles/profile.cc
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 5a0319289516b41717b78f0452943367f70b7d6e..288485391151d2e62b54a19eda397eb1b4dd1170 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -544,6 +544,17 @@ class OffTheRecordProfileImpl : public Profile,
     return host_content_settings_map_.get();
   }
 
+  virtual CookieContentSettings* GetCookieContentSettings() {
+    // Retrieve the host content settings map of the parent profile in order to
+    // ensure the preferences have been migrated.
+    profile_->GetHostContentSettingsMap();
+    if (!cookie_content_settings_.get()) {
+      cookie_content_settings_ = new CookieContentSettings(
+          GetHostContentSettingsMap(), GetPrefs(), true);
+    }
+    return cookie_content_settings_.get();
+  }
+
   virtual HostZoomMap* GetHostZoomMap() {
     if (!host_zoom_map_)
       host_zoom_map_ = new HostZoomMap();
@@ -799,6 +810,8 @@ class OffTheRecordProfileImpl : public Profile,
   // We use a non-persistent content settings map for OTR.
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 
+  scoped_refptr<CookieContentSettings> cookie_content_settings_;
+
   // Use a separate zoom map for OTR.
   scoped_refptr<HostZoomMap> host_zoom_map_;