Use ThreadChecker rather than DCHECK_CURRENTLY_ON.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 493 matching lines @@
     prefs_->AddPrefInitObserver(base::Bind(&ProfileImpl::OnPrefsLoaded,
                                            base::Unretained(this)));
   } else {
     // Prefs were loaded synchronously so we can continue directly.
     OnPrefsLoaded(true);
   }
 }
 
 void ProfileImpl::DoFinalInit() {
   TRACE_EVENT0("browser", "ProfileImpl::DoFinalInit")
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   PrefService* prefs = GetPrefs();
   pref_change_registrar_.Init(prefs);
   pref_change_registrar_.Add(
       prefs::kGoogleServicesUsername,
       base::Bind(&ProfileImpl::UpdateProfileUserNameCache,
                  base::Unretained(this)));
   pref_change_registrar_.Add(
       prefs::kSupervisedUserId,
       base::Bind(&ProfileImpl::UpdateProfileSupervisedUserIdCache,
                  base::Unretained(this)));
@@ skipping 100 matching lines @@
 #endif
   content::CookieStoreConfig::SessionCookieMode session_cookie_mode =
       content::CookieStoreConfig::PERSISTANT_SESSION_COOKIES;
   if (GetLastSessionExitType() == Profile::EXIT_CRASHED ||
       startup_pref_type == SessionStartupPref::LAST) {
     session_cookie_mode = content::CookieStoreConfig::RESTORED_SESSION_COOKIES;
   }
 
   InitHostZoomMap();
 
+  // Make sure HostContentSettingsMap is created on the UI thread.

[vabr (Chromium), 2014/10/01 11:14:48]

This only really makes sure that HCSM is created on the UI, if we expect HCSM is
actually created here. If that's the case, should there be a
DCHECK(!host_content_settings_map_); just before the GetHostContentSettingsMap()
call?

Alternatively, should we somehow let HCSM check through its new thread_checker_,
that this is the thread it got created on?

If you change something here to accommodate the above, please also change the
OTR profile accordingly.

[vabr (Chromium), 2014/10/01 11:14:48]

Also, should chrome/test/base/testing_profile.cc get a similar call to
GetHostContentSettingsMap() in its Init() or FinishInit()?

[Bernhard Bauer, 2014/10/01 11:41:09]

Really, if we have a defined place where we construct the HCSM, we don't need to
do the lazy construction at all anyway.

Alternatively, we could check that GetHostContentSettingsMap() is only called on
the UI thread? That's a valid precondition, because Profile is UI-thread only.

[Jun Mukai, 2014/10/14 23:53:13]

Indeed, I was confused previously but we can add DCHECK in
GetHostContentSettingsMap() (ProfileIOData has the pointer to the instance, but
it invokes GetHostContentSettingsMap in UI thread and then remembers the value).
 Fixed.

+  GetHostContentSettingsMap();
+
   base::Callback<void(bool)> data_reduction_proxy_unavailable;
   scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
       data_reduction_proxy_params;
   scoped_ptr<DataReductionProxyChromeConfigurator> chrome_configurator;
   scoped_ptr<data_reduction_proxy::DataReductionProxyStatisticsPrefs>
       data_reduction_proxy_statistics_prefs;
   DataReductionProxyChromeSettings* data_reduction_proxy_chrome_settings =
       DataReductionProxyChromeSettingsFactory::GetForBrowserContext(this);
   data_reduction_proxy_params =
       data_reduction_proxy_chrome_settings->params()->Clone();
@@ skipping 791 matching lines @@
       domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
           GetForBrowserContext(this);
   if (!service)
     return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
       local_state,
       prefs::kMetricsReportingEnabled);
 }