[HBD] Detect user-initiated Flash download in a new window

chrome/browser/content_settings/host_content_settings_map_factory.cc

Index: chrome/browser/content_settings/host_content_settings_map_factory.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc
index 546361be7cc31066392e32223cefa1b94e3621c8..b0db710bb01c4dad3061b0d8d32527a66e663857 100644
--- a/chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -66,8 +66,12 @@ scoped_refptr<RefcountedKeyedService>
 
   // If off the record, retrieve the host content settings map of the parent
   // profile in order to ensure the preferences have been migrated.
-  if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE)
+  // TODO(crbug.com/277296): Remove check that profile does not equal the
+  // original profile once TestingProfile::ForceIncognito is gone.
+  if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE &&
+      profile != profile->GetOriginalProfile()) {
     GetForProfile(profile->GetOriginalProfile());
+  }
 
   scoped_refptr<HostContentSettingsMap> settings_map(new HostContentSettingsMap(
       profile->GetPrefs(),