Remove content dependencies from content settings providers.

chrome/browser/profiles/off_the_record_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/off_the_record_profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 336 matching lines @@
 
 net::SSLConfigService* OffTheRecordProfileImpl::GetSSLConfigService() {
   return profile_->GetSSLConfigService();
 }
 
 HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() {
   // Retrieve the host content settings map of the parent profile in order to
   // ensure the preferences have been migrated.
   profile_->GetHostContentSettingsMap();
   if (!host_content_settings_map_.get()) {
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

[rpetterson, 2014/09/26 03:46:34]

Is there a reason not to have this at the start of the function? Should it ever
not be called on the UI thread?

[Jun Mukai, 2014/09/26 07:45:14]

The motivation of this CL is to strip off the dependency on content/ from these
files.  And the content/ dependency is because of iOS support -- iOS cannot
depend on content/

[blundell, 2014/09/26 07:50:41]

I think the question is why this DCHECK shouldn't be before line 355.

[Jun Mukai, 2014/09/26 18:37:37]

Ah...
HostContentSettings is thread-safe object and can be used by ProfileIOData. It's
simply initialization process -- but indeed this is weird.  If some non-UI
thread calls GetHostContentSettingsMap() first, it would lead to an unexpected
result.

The reason why it is okay on the current code base is because
HostContentSettingsMap is required in DoFinalInit (through the call stack of
GetSpecialStoragePolicy() -> CookieSettings ctor -> GetHostContentSettings()).
But relying on this structure implicitly wouldn't be great.

Let me think about this.

     host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), true);
 #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 169 matching lines @@
 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
 #if defined(OS_CHROMEOS)
   if (chromeos::ProfileHelper::IsSigninProfile(this)) {
     return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
         g_browser_process->local_state());
   }
 #endif  // defined(OS_CHROMEOS)
   return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
       GetPrefs(), g_browser_process->local_state());
 }