Adding CookieSettings for storing cookie content settings.

chrome/browser/profiles/profile_io_data.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/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/media/media_internals.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
 #include "chrome/browser/net/chrome_net_log.h"
@@ skipping 185 matching lines @@
   // For the latter, we need a change on the webkit-side.
   // We initialize it to the default charset here and a user will
   // have an *arguably* better default charset for interpreting a raw 8bit
   // C-D header field.  It means the native OS codepage fallback in
   // net_util::GetSuggestedFilename is unlikely to be taken.
   params->referrer_charset = default_charset;
 
   params->io_thread = g_browser_process->io_thread();
 
   params->host_content_settings_map = profile->GetHostContentSettingsMap();
+  params->cookie_settings = CookieSettings::GetForProfile(profile);
   params->host_zoom_map = profile->GetHostZoomMap();
   params->ssl_config_service = profile->GetSSLConfigService();
   base::Callback<Profile*(void)> profile_getter =
       base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(),
                  profile);
   params->cookie_monster_delegate =
       new ChromeCookieMonsterDelegate(profile_getter);
   params->database_tracker = profile->GetDatabaseTracker();
   params->appcache_service = profile->GetAppCacheService();
   params->blob_storage_context = profile->GetBlobStorageContext();
@@ skipping 131 matching lines @@
 }
 
 ExtensionInfoMap* ProfileIOData::GetExtensionInfoMap() const {
   return extension_info_map_;
 }
 
 HostContentSettingsMap* ProfileIOData::GetHostContentSettingsMap() const {
   return host_content_settings_map_;
 }
 
+CookieSettings* ProfileIOData::GetCookieSettings() const {
+  return cookie_settings_;
+}
+
 DesktopNotificationService* ProfileIOData::GetNotificationService() const {
   return notification_service_;
 }
 
 ProfileIOData::ResourceContext::ResourceContext(const ProfileIOData* io_data)
     : io_data_(io_data) {
   DCHECK(io_data);
 }
 
 ProfileIOData::ResourceContext::~ResourceContext() {}
@@ skipping 95 matching lines @@
   media_stream_manager_.reset(new media_stream::MediaStreamManager);
 
   // Take ownership over these parameters.
   database_tracker_ = profile_params_->database_tracker;
   appcache_service_ = profile_params_->appcache_service;
   blob_storage_context_ = profile_params_->blob_storage_context;
   file_system_context_ = profile_params_->file_system_context;
   quota_manager_ = profile_params_->quota_manager;
   host_zoom_map_ = profile_params_->host_zoom_map;
   host_content_settings_map_ = profile_params_->host_content_settings_map;
+  cookie_settings_ = profile_params_->cookie_settings;
   notification_service_ = profile_params_->notification_service;
   extension_info_map_ = profile_params_->extension_info_map;
 
   resource_context_.set_host_resolver(io_thread_globals->host_resolver.get());
   resource_context_.set_request_context(main_request_context_);
   resource_context_.set_database_tracker(database_tracker_);
   resource_context_.set_appcache_service(appcache_service_);
   resource_context_.set_blob_storage_context(blob_storage_context_);
   resource_context_.set_file_system_context(file_system_context_);
   resource_context_.set_quota_manager(quota_manager_);
@@ skipping 37 matching lines @@
   bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                                         new DeleteTask<ProfileIOData>(this));
   if (!posted)
     delete this;
 }
 
 void ProfileIOData::set_origin_bound_cert_service(
     net::OriginBoundCertService* origin_bound_cert_service) const {
   origin_bound_cert_service_.reset(origin_bound_cert_service);
 }