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

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

Issue 12077030: Allow signin to continue even if sync is disabled by policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows sync integration test failure Created 7 years, 11 months 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/defaults.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 46dbd95c943a9d32d8314e3d1e69c72161d861c4..855c5563e626db4fb1f71c05368f811e6895b55f 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -881,6 +881,13 @@ net::URLRequestContextGetter* ProfileImpl::GetRequestContextForStoragePartition(
}
net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
+ // If ssl_config_service_manager_ is null, this typically means that some
+ // ProfileKeyedService is trying to create a RequestContext at startup, but
+ // SSLConfigServiceManager is not initialized until DoFinalInit() which is
+ // invoked after all ProfileKeyedServices have been initialized (see
+ // http://crbug.com/171406).
+ DCHECK(ssl_config_service_manager_.get()) <<
+ "SSLConfigServiceManager is not initialized yet";
return ssl_config_service_manager_->Get();
}
« no previous file with comments | « chrome/browser/defaults.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698