Use ThreadChecker rather than DCHECK_CURRENTLY_ON.

chrome/test/base/testing_profile.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/test/base/testing_profile.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 812 matching lines @@
   return GetRequestContext();
 }
 
 content::ResourceContext* TestingProfile::GetResourceContext() {
   if (!resource_context_)
     resource_context_ = new content::MockResourceContext();
   return resource_context_;
 }
 
 HostContentSettingsMap* TestingProfile::GetHostContentSettingsMap() {
+  DCHECK(!content::BrowserThread::IsThreadInitialized(

[Paweł Hajdan Jr., 2014/10/20 09:11:51]

This seems the only place in this patch where IsThreadInitialized is used. Why
is that needed?

[Jun Mukai, 2014/10/20 17:02:51]

I copied this check from TestingProfile::Init().  I haven't tried the case
without this check, but I believe that some unit tests may not run
BrowserThread::UI, and enforcing to run BrowserThread for any tests using
TestingProfile is a bad idea.

[Paweł Hajdan Jr., 2014/10/21 09:30:58]

If it's really needed, please extract it to a common method.
Could you try it?
Why?

[Jun Mukai, 2014/10/22 06:30:13]

Tried and I was wrong. Changed to use DCHECK_CURRENTLY_ON.  PTAL.

+             content::BrowserThread::UI) ||
+         content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (!host_content_settings_map_.get()) {
     host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);
 #if defined(ENABLE_EXTENSIONS)
     ExtensionService* extension_service =
         extensions::ExtensionSystem::Get(this)->extension_service();
     if (extension_service) {
       extension_service->RegisterContentSettings(
           host_content_settings_map_.get());
     }
 #endif
@@ skipping 179 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
                             extension_policy_,
 #endif
                             pref_service_.Pass(),
                             original_profile,
                             guest_session_,
                             supervised_user_id_,
                             policy_service_.Pass(),
                             testing_factories_);
 }