Convert SetIsIncognitoProcess to use mojo.

chrome/renderer/chrome_render_thread_observer.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/renderer/chrome_render_thread_observer.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <memory>
@@ skipping 218 matching lines @@
                           std::move(request));
 }
 
 }  // namespace
 
 bool ChromeRenderThreadObserver::is_incognito_process_ = false;
 
 ChromeRenderThreadObserver::ChromeRenderThreadObserver()
     : field_trial_syncer_(this),
       visited_link_slave_(new visitedlink::VisitedLinkSlave),
+      renderer_configuration_binding_(this),
       weak_factory_(this) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
   RenderThread* thread = RenderThread::Get();
   resource_delegate_.reset(new RendererResourceDelegate());
   thread->SetResourceDispatcherDelegate(resource_delegate_.get());
 
   thread->GetInterfaceRegistry()->AddInterface(
       base::Bind(CreateResourceUsageReporter, weak_factory_.GetWeakPtr()));
@@ skipping 18 matching lines @@
   WebSecurityPolicy::registerURLSchemeAsNoAccess(native_scheme);
   WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
       native_scheme);
 
   thread->GetInterfaceRegistry()->AddInterface(
       visited_link_slave_->GetBindCallback());
 }
 
 ChromeRenderThreadObserver::~ChromeRenderThreadObserver() {}
 
+void ChromeRenderThreadObserver::RegisterMojoInterfaces(
+    content::AssociatedInterfaceRegistry* associated_interfaces) {
+  associated_interfaces->AddInterface(
+      base::Bind(&ChromeRenderThreadObserver::OnRendererInterfaceRequest,
+                 base::Unretained(this)));
+}
+
+void ChromeRenderThreadObserver::UnregisterMojoInterfaces(
+    content::AssociatedInterfaceRegistry* associated_interfaces) {
+  associated_interfaces->RemoveInterface(
+      chrome::mojom::RendererConfiguration::Name_);
+}
+
 bool ChromeRenderThreadObserver::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeRenderThreadObserver, message)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsIncognitoProcess,
-                        OnSetIsIncognitoProcess)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetFieldTrialGroup, OnSetFieldTrialGroup)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetContentSettingRules,
                         OnSetContentSettingRules)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ChromeRenderThreadObserver::OnRenderProcessShutdown() {
   visited_link_slave_.reset();
+  // This renderer_configuration_binding_.Unbind call works around tests that

[Ken Rockot(use gerrit already), 2016/12/09 04:29:08]

nit: Probably sufficient to just way "Workaround for http://crbug.com/672646"

[nigeltao1, 2016/12/09 04:59:40]

Done.

+  // run in single-process mode, where the renderer_configuration_binding_
+  // destructor is (mistakenly??) run on the wrong thread during teardown. See
+  // https://groups.google.com/a/chromium.org/d/msg/chromium-mojo/BKjxN1DLdrc/vBCU5Pw5AAAJ
+  // and http://crbug.com/672646
+  if (renderer_configuration_binding_.is_bound())
+    renderer_configuration_binding_.Unbind();
 }
 
 void ChromeRenderThreadObserver::OnFieldTrialGroupFinalized(
     const std::string& trial_name,
     const std::string& group_name) {
   chrome::mojom::FieldTrialRecorderPtr field_trial_recorder;
   content::RenderThread::Get()->GetRemoteInterfaces()->GetInterface(
       &field_trial_recorder);
   field_trial_recorder->FieldTrialActivated(trial_name);
 }
 
-void ChromeRenderThreadObserver::OnSetIsIncognitoProcess(
+void ChromeRenderThreadObserver::SetInitialConfiguration(
     bool is_incognito_process) {
   is_incognito_process_ = is_incognito_process;
 }
 
+void ChromeRenderThreadObserver::OnRendererInterfaceRequest(
+    chrome::mojom::RendererConfigurationAssociatedRequest request) {
+  DCHECK(!renderer_configuration_binding_.is_bound());
+  renderer_configuration_binding_.Bind(std::move(request));
+}
+
 void ChromeRenderThreadObserver::OnSetContentSettingRules(
     const RendererContentSettingRules& rules) {
   content_setting_rules_ = rules;
 }
 
 void ChromeRenderThreadObserver::OnSetFieldTrialGroup(
     const std::string& trial_name,
     const std::string& group_name) {
   field_trial_syncer_.OnSetFieldTrialGroup(trial_name, group_name);
 }
 
 const RendererContentSettingRules*
 ChromeRenderThreadObserver::content_setting_rules() const {
   return &content_setting_rules_;
 }