Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1543)

Unified Diff: chrome/browser/profiles/profile.cc

Issue 6019005: Use separate SSL session caches per profile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/net/ssl_config_service_manager_pref.cc ('k') | net/base/ssl_config_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile.cc
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 1e2bba4e5ae035ee6efb15884f72929a64fb3c7a..4476dbb8878c46c14289ec87b6ad70844283b58d 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/file_system/browser_file_system_helper.h"
#include "chrome/browser/in_process_webkit/webkit_context.h"
#include "chrome/browser/net/chrome_url_request_context.h"
+#include "chrome/browser/net/ssl_config_service_manager.h"
#include "chrome/browser/notifications/desktop_notification_service.h"
#include "chrome/browser/ssl/ssl_host_state.h"
#include "chrome/browser/sync/profile_sync_service.h"
@@ -135,6 +136,9 @@ class OffTheRecordProfileImpl : public Profile,
explicit OffTheRecordProfileImpl(Profile* real_profile)
: profile_(real_profile),
start_time_(Time::Now()) {
+ ssl_config_service_manager_.reset(
+ SSLConfigServiceManager::CreateDefaultManager(this));
+
request_context_ = ChromeURLRequestContextGetter::CreateOffTheRecord(this);
extension_process_manager_.reset(ExtensionProcessManager::Create(this));
@@ -389,7 +393,7 @@ class OffTheRecordProfileImpl : public Profile,
}
virtual net::SSLConfigService* GetSSLConfigService() {
- return profile_->GetSSLConfigService();
+ return ssl_config_service_manager_->Get();
}
virtual HostContentSettingsMap* GetHostContentSettingsMap() {
@@ -662,6 +666,10 @@ class OffTheRecordProfileImpl : public Profile,
// Should be used only on the file thread.
scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
+ // A separate SSLConfigServiceManager from the main profile because
+ // we require a separate SSL session cache.
+ scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
+
FilePath last_selected_directory_;
// Tracks all BackgroundContents running under this profile.
« no previous file with comments | « chrome/browser/net/ssl_config_service_manager_pref.cc ('k') | net/base/ssl_config_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698