Solve ProfileIOData, Extension, HostContentSettingsMap ordering issue.

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index ad71689d7a0f1542241593dd9f90dea75aed5374..aed7c6b2ab1682933564a60f557a3db3d10c3c0a 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -2047,21 +2047,25 @@ const Extension* ExtensionService::GetPendingExtensionUpdate(
 }
 
 void ExtensionService::RegisterContentSettings(
-    HostContentSettingsMap* host_content_settings_map) {
+    HostContentSettingsMap* host_content_settings_map,
+    Profile* profile) {
+  // Most extension services key off of the original profile.
+  Profile* original_profile = profile->GetOriginalProfile();
+
   TRACE_EVENT0("browser,startup", "ExtensionService::RegisterContentSettings");
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   host_content_settings_map->RegisterProvider(
       HostContentSettingsMap::INTERNAL_EXTENSION_PROVIDER,
       std::unique_ptr<content_settings::ObservableProvider>(
-          new content_settings::InternalExtensionProvider(profile_)));
+          new content_settings::InternalExtensionProvider(original_profile)));
 
   host_content_settings_map->RegisterProvider(
       HostContentSettingsMap::CUSTOM_EXTENSION_PROVIDER,
       std::unique_ptr<content_settings::ObservableProvider>(
           new content_settings::CustomExtensionProvider(
-              extensions::ContentSettingsService::Get(profile_)
+              extensions::ContentSettingsService::Get(original_profile)
                   ->content_settings_store(),
-              profile_->GetOriginalProfile() != profile_)));
+              false)));

[Devlin, 2017/05/15 16:53:21]

This is the only place the bool was specified, even though it's guaranteed to
have always been false (in the original code as well).  But it looks like the
incognito bool is actually used in the code for the CustomExtensionProvider...
can we add a TODO to address that?  Maybe bauerb@ knows more about it?

[mmenke, 2017/05/15 17:08:17]

TODO added.  I'd offer to address it myself (Since I assume this fix is just to
use profile != original_profile, in the new code), except that it probably needs
a browser test, which is more effort than I'm willing to invest.

 }
 
 void ExtensionService::TrackTerminatedExtension(