Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 2cab771dcbe9857263ba97ea71a87b5e9eea2297..74ff76aea72f1a0729e2852735f8f5f010124ba0 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -108,6 +108,7 @@ |
#include "chrome/common/pepper_permission_util.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/common/render_messages.h" |
+#include "chrome/common/renderer.mojom.h" |
#include "chrome/common/secure_origin_whitelist.h" |
#include "chrome/common/stack_sampling_configuration.h" |
#include "chrome/common/url_constants.h" |
@@ -1078,8 +1079,11 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch( |
host->AddFilter(new cdm::CdmMessageFilterAndroid()); |
#endif |
- host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
- profile->IsOffTheRecord())); |
+ bool is_incognito_process = profile->IsOffTheRecord(); |
+ |
+ chrome::mojom::RendererAssociatedPtr renderer_interface; |
+ host->GetChannel()->GetRemoteAssociatedInterface(&renderer_interface); |
+ renderer_interface->SetInitialConfiguration(is_incognito_process); |
for (size_t i = 0; i < extra_parts_.size(); ++i) |
extra_parts_[i]->RenderProcessWillLaunch(host); |
@@ -1087,7 +1091,7 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch( |
RendererContentSettingRules rules; |
if (host->IsForGuestsOnly()) { |
#if BUILDFLAG(ENABLE_EXTENSIONS) |
- GetGuestViewDefaultContentSettingRules(profile->IsOffTheRecord(), &rules); |
+ GetGuestViewDefaultContentSettingRules(is_incognito_process, &rules); |
#else |
NOTREACHED(); |
#endif |
@@ -1095,6 +1099,8 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch( |
GetRendererContentSettingRules( |
HostContentSettingsMapFactory::GetForProfile(profile), &rules); |
} |
+ // TODO(nigeltao): eliminate this legacy IPC. Instead, add an extra arg to |
+ // the renderer_interface->SetInitialConfiguration call. |
host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); |
} |