Synchronously disable ConnectionFilterImpl when its RPHI cleans up

content/browser/renderer_host/render_process_host_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 12 matching lines @@
 #include "content/browser/child_process_launcher.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/power_monitor_message_broadcaster.h"
 #include "content/browser/webrtc/webrtc_eventlog_host.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_platform_file.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "services/shell/public/interfaces/service.mojom.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gl/gpu_switching_observer.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/android/interface_registry_android.h"
 #endif
 
 namespace base {
 class CommandLine;
@@ skipping 251 matching lines @@
 #endif
 
   // The count of currently swapped out but pending RenderViews.  We have
   // started to swap these in, so the renderer process should not exit if
   // this count is non-zero.
   int32_t pending_views_;
 
  private:
   friend class ChildProcessLauncherBrowserTest_ChildSpawnFail_Test;
   friend class VisitRelayingRenderProcessHost;
+  class ConnectionFilterController;
   class ConnectionFilterImpl;
 
   std::unique_ptr<IPC::ChannelProxy> CreateChannelProxy(
       const std::string& channel_id);
 
   // Creates and adds the IO thread message filters.
   void CreateMessageFilters();
 
   // Registers Mojo interfaces to be exposed to the renderer.
   void RegisterMojoInterfaces();
@@ skipping 46 matching lines @@
                                  IPC::PlatformFileForTransit file_for_transit);
   void SendDisableAecDumpToRenderer();
   base::FilePath GetAecDumpFilePathWithExtensions(const base::FilePath& file);
 #endif
 
   static void OnMojoError(
       base::WeakPtr<RenderProcessHostImpl> process,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       const std::string& error);
 
+  template <typename InterfaceType>
+  using AddInterfaceCallback =
+      base::Callback<void(mojo::InterfaceRequest<InterfaceType>)>;
+
+  template <typename CallbackType>
+  struct InterfaceGetter;
+
+  template <typename InterfaceType>
+  struct InterfaceGetter<AddInterfaceCallback<InterfaceType>> {
+    static void GetInterfaceOnUIThread(
+        base::WeakPtr<RenderProcessHostImpl> weak_host,
+        const AddInterfaceCallback<InterfaceType>& callback,
+        mojo::InterfaceRequest<InterfaceType> request) {
+      if (!weak_host)
+        return;
+      callback.Run(std::move(request));
+    }
+  };
+
+  // Helper to bind an interface callback whose lifetime is limited to that of
+  // the render process currently hosted by the RPHI. Callbacks added by this
+  // method will never run beyond the next invocation of Cleanup().
+  template <typename CallbackType>
+  void AddUIThreadInterface(shell::InterfaceRegistry* registry,
+                            const CallbackType& callback) {
+    registry->AddInterface(
+        base::Bind(&InterfaceGetter<CallbackType>::GetInterfaceOnUIThread,
+                   instance_weak_factory_->GetWeakPtr(), callback),
+        BrowserThread::GetTaskRunnerForThread(BrowserThread::UI));
+  }
+
   std::string child_token_;
 
   std::unique_ptr<MojoChildConnection> mojo_child_connection_;
-  int connection_filter_ = MojoShellConnection::kInvalidConnectionFilterId;
+  int connection_filter_id_ = MojoShellConnection::kInvalidConnectionFilterId;
+  scoped_refptr<ConnectionFilterController> connection_filter_controller_;
   shell::mojom::ServicePtr test_service_;
 #if defined(OS_ANDROID)
   std::unique_ptr<InterfaceRegistryAndroid> interface_registry_android_;
 #endif
 
   // The registered IPC listener objects. When this list is empty, we should
   // delete ourselves.
   IDMap<IPC::Listener> listeners_;
 
   // The count of currently visible widgets.  Since the host can be a container
@@ skipping 136 matching lines @@
   // UI thread is the source of sync IPCs and all shutdown signals.
   // Therefore a proper shutdown event to unblock the UI thread is not
   // possible without massive refactoring shutdown code.
   // Luckily Android never performs a clean shutdown. So explicitly
   // ignore this problem.
   base::WaitableEvent never_signaled_;
 #endif
 
   scoped_refptr<ResourceMessageFilter> resource_message_filter_;
 
+  // A WeakPtrFactory which is reset every time Cleanup() runs. Used to vend
+  // WeakPtrs which are invalidated any time the RPHI is recycled.
+  std::unique_ptr<base::WeakPtrFactory<RenderProcessHostImpl>>
+      instance_weak_factory_;
+
   base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_IMPL_H_