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

chrome/browser/content_settings/host_content_settings_map_factory.cc

 // Copyright 2015 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/content_settings/host_content_settings_map_factory.h"
 
 #include <utility>
 
 #include "chrome/browser/prefs/pref_service_syncable_util.h"
 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
@@ skipping 48 matching lines @@
 
 scoped_refptr<RefcountedKeyedService>
     HostContentSettingsMapFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   Profile* profile = static_cast<Profile*>(context);
 
   // 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(),
       profile->GetProfileType() == Profile::INCOGNITO_PROFILE,
       profile->GetProfileType() == Profile::GUEST_PROFILE));
 
   syncable_prefs::PrefServiceSyncable* pref_service =
       PrefServiceSyncableFromProfile(profile);
   if (pref_service) {
     pref_service->RegisterMergeDataFinishedCallback(
@@ skipping 21 matching lines @@
   }
 #endif // defined(ENABLE_SUPERVISED_USERS)
 
   return settings_map;
 }
 
 content::BrowserContext* HostContentSettingsMapFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return context;
 }