Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 9c9c1de7255042138862ab90b30df1d8917e3cd2..998f26fbd6fca5e46b70102352a576a618648794 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -388,6 +388,10 @@ ProfileImpl::ProfileImpl( |
DCHECK(!path.empty()) << "Using an empty path will attempt to write " << |
"profile files to the root directory!"; |
+#if defined(OS_CHROMEOS) |
+ is_login_profile_ = chromeos::ProfileHelper::IsSigninProfile(this); |
willchan no longer on Chromium
2013/10/29 01:21:09
Which code needs |is_login_profile_| to be set ear
pneubeck (no reviews)
2013/10/29 09:56:22
ProfilePolicyConnectorFactory::CreateForProfile(In
pneubeck (no reviews)
2013/10/30 08:32:03
Actually, my original plan was to inline ProfileHe
willchan no longer on Chromium
2013/10/30 17:20:48
If that's a short CL, can you do that first and re
pneubeck (no reviews)
2013/10/31 08:41:40
CL is in review: https://codereview.chromium.org/5
|
+#endif |
+ |
#if defined(ENABLE_SESSION_SERVICE) |
create_session_service_timer_.Start(FROM_HERE, |
TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this, |
@@ -424,7 +428,6 @@ ProfileImpl::ProfileImpl( |
bool async_prefs = create_mode == CREATE_MODE_ASYNCHRONOUS; |
#if defined(OS_CHROMEOS) |
- is_login_profile_ = chromeos::ProfileHelper::IsSigninProfile(this); |
if (is_login_profile_) |
chrome::RegisterLoginProfilePrefs(pref_registry_.get()); |
else |
@@ -667,6 +670,8 @@ ProfileImpl::~ProfileImpl() { |
io_data_.GetResourceContextNoInit()); |
#endif |
+ io_data_.ReleaseFromBrowserContextServices(this); |
willchan no longer on Chromium
2013/10/30 01:12:31
Would it work to let the ProfileImplIOData::Handle
pneubeck (no reviews)
2013/10/30 08:32:03
Yes, that will work. But again only, because every
willchan no longer on Chromium
2013/10/30 17:20:48
Great point! I personally mentally dismissed that
|
+ |
// Destroy OTR profile and its profile services first. |
if (off_the_record_profile_) { |
ProfileDestroyer::DestroyOffTheRecordProfileNow( |