Convert network hints to Mojo

Review-Url: https://codereview.chromium.org/2144533002
Cr-Commit-Position: refs/heads/master@{#406780}

chrome/browser/BUILD.gn

@@ -364,6 +364,7 @@ split_static_library("browser") {
       "//components/navigation_interception",
       "//components/net_log",
       "//components/network_hints/common",
+      "//components/network_hints/public/interfaces:network_hints_mojom",
       "//components/password_manager/content/browser",
       "//components/password_manager/sync/browser",
       "//components/profile_metrics",

chrome/browser/chrome_content_browser_client.cc

@@ -967,7 +967,14 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch(
   net::URLRequestContextGetter* context =
       host->GetStoragePartition()->GetURLRequestContext();
 
-  host->AddFilter(new ChromeRenderMessageFilter(id, profile));
+  // The host owns both |chrome_render| and the interface registry, which will
+  // be destroyed before the filter.
+  auto* chrome_render_filter = new ChromeRenderMessageFilter(id, profile);
+  host->GetInterfaceRegistry()->AddInterface(
+      base::Bind(&ChromeRenderMessageFilter::BindNetworkHints,
+                 base::Unretained(chrome_render_filter)),
+      BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
+  host->AddFilter(chrome_render_filter);
 #if defined(ENABLE_EXTENSIONS)
   host->AddFilter(new cast::CastTransportHostFilter);
 #endif

chrome/browser/renderer_host/chrome_render_message_filter.cc

@@ -25,7 +25,6 @@
 #include "components/content_settings/content/common/content_settings_messages.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/network_hints/common/network_hints_common.h"
-#include "components/network_hints/common/network_hints_messages.h"
 #include "components/rappor/rappor_service.h"
 #include "components/rappor/rappor_utils.h"
 #include "components/web_cache/browser/web_cache_manager.h"
@@ -42,9 +41,8 @@ using content::BrowserThread;
 
 namespace {
 
-const uint32_t kFilteredMessageClasses[] = {
-    ChromeMsgStart, ContentSettingsMsgStart, NetworkHintsMsgStart,
-};
+const uint32_t kFilteredMessageClasses[] = {ChromeMsgStart,
+                                            ContentSettingsMsgStart};
 
 }  // namespace
 
@@ -64,8 +62,6 @@ ChromeRenderMessageFilter::~ChromeRenderMessageFilter() {
 bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeRenderMessageFilter, message)
-    IPC_MESSAGE_HANDLER(NetworkHintsMsg_DNSPrefetch, OnDnsPrefetch)
-    IPC_MESSAGE_HANDLER(NetworkHintsMsg_Preconnect, OnPreconnect)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_UpdatedCacheStats,
                         OnUpdatedCacheStats)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDatabase, OnAllowDatabase)
@@ -106,17 +102,17 @@ void ChromeRenderMessageFilter::OverrideThreadForMessage(
   }
 }
 
-void ChromeRenderMessageFilter::OnDnsPrefetch(
+void ChromeRenderMessageFilter::DNSPrefetch(
     const network_hints::LookupRequest& request) {
   if (predictor_)
     predictor_->DnsPrefetchList(request.hostname_list);
 }
 
-void ChromeRenderMessageFilter::OnPreconnect(const GURL& url,
-                                             bool allow_credentials,
-                                             int count) {
+void ChromeRenderMessageFilter::Preconnect(const GURL& url,
+                                           bool allow_credentials,
+                                           int count) {
   if (count < 1) {
-    LOG(WARNING) << "NetworkHintsMsg_Preconnect IPC with invalid count: "
+    LOG(WARNING) << "NetworkHints::Preconnect IPC with invalid count: "
                  << count;
     return;
   }
@@ -128,6 +124,11 @@ void ChromeRenderMessageFilter::OnPreconnect(const GURL& url,
   }
 }
 
+void ChromeRenderMessageFilter::BindNetworkHints(
+    network_hints::mojom::NetworkHintsRequest request) {
+  bindings_.AddBinding(this, std::move(request));
+}
+
 void ChromeRenderMessageFilter::OnUpdatedCacheStats(
     uint64_t min_dead_capacity,
     uint64_t max_dead_capacity,

chrome/browser/renderer_host/chrome_render_message_filter.h

@@ -11,7 +11,9 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "components/network_hints/public/interfaces/network_hints.mojom.h"
 #include "content/public/browser/browser_message_filter.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
 
 class GURL;
 class Profile;
@@ -34,7 +36,8 @@ class InfoMap;
 
 // This class filters out incoming Chrome-specific IPC messages for the renderer
 // process on the IPC thread.
-class ChromeRenderMessageFilter : public content::BrowserMessageFilter {
+class ChromeRenderMessageFilter : public content::BrowserMessageFilter,
+                                  public network_hints::mojom::NetworkHints {
  public:
   ChromeRenderMessageFilter(int render_process_id, Profile* profile);
 
@@ -43,14 +46,18 @@ class ChromeRenderMessageFilter : public content::BrowserMessageFilter {
   void OverrideThreadForMessage(const IPC::Message& message,
                                 content::BrowserThread::ID* thread) override;
 
+  void BindNetworkHints(network_hints::mojom::NetworkHintsRequest request);
+
  private:
   friend class content::BrowserThread;
   friend class base::DeleteHelper<ChromeRenderMessageFilter>;
 
   ~ChromeRenderMessageFilter() override;
 
-  void OnDnsPrefetch(const network_hints::LookupRequest& request);
-  void OnPreconnect(const GURL& url, bool allow_credentials, int count);
+  // mojom::NetworkHints methods:
+  void DNSPrefetch(const network_hints::LookupRequest& request) override;
+  void Preconnect(const GURL& url, bool allow_credentials, int count) override;
+
   void OnUpdatedCacheStats(uint64_t min_capacity,
                            uint64_t max_capacity,
                            uint64_t capacity,
@@ -132,6 +139,8 @@ class ChromeRenderMessageFilter : public content::BrowserMessageFilter {
   // Used to look up permissions at database creation time.
   scoped_refptr<content_settings::CookieSettings> cookie_settings_;
 
+  mojo::BindingSet<network_hints::mojom::NetworkHints> bindings_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeRenderMessageFilter);
 };
 

chrome/chrome_browser.gypi

@@ -3299,6 +3299,7 @@
         '../components/components.gyp:metrics_services_manager',
         '../components/components.gyp:metrics_ui',
         '../components/components.gyp:navigation_metrics',
+        '../components/components.gyp:network_hints_mojom',
         '../components/components.gyp:network_time',
         '../components/components.gyp:offline_pages',
         '../components/components.gyp:omnibox_browser',
@@ -3430,6 +3431,8 @@
             '../components/components.gyp:navigation_interception',
             '../components/components.gyp:net_log',
             '../components/components.gyp:network_hints_common',
+            '../components/components.gyp:network_hints_mojom',
+            '../components/components.gyp:network_hints_public_cpp',
             '../components/components.gyp:network_session_configurator',
             '../components/components.gyp:ntp_snippets',
             '../components/components.gyp:ntp_tiles',

chrome/renderer/chrome_content_renderer_client.cc

@@ -342,8 +342,6 @@ void ChromeContentRendererClient::RenderThreadStarted() {
   ChromeExtensionsRendererClient::GetInstance()->RenderThreadStarted();
 #endif
 
-  prescient_networking_dispatcher_.reset(
-      new network_hints::PrescientNetworkingDispatcher());
 #if defined(ENABLE_SPELLCHECK)
   // ChromeRenderViewTest::SetUp() creates a Spellcheck and injects it using
   // SetSpellcheck(). Don't overwrite it.
@@ -1140,7 +1138,7 @@ bool ChromeContentRendererClient::IsLinkVisited(unsigned long long link_hash) {
 
 blink::WebPrescientNetworking*
 ChromeContentRendererClient::GetPrescientNetworking() {
-  return prescient_networking_dispatcher_.get();
+  return chrome_observer_->prescient_networking_dispatcher();
 }
 
 bool ChromeContentRendererClient::ShouldOverridePageVisibilityState(

chrome/renderer/chrome_content_renderer_client.h

@@ -207,9 +207,6 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   std::unique_ptr<ChromeRenderThreadObserver> chrome_observer_;
   std::unique_ptr<web_cache::WebCacheImpl> web_cache_impl_;
 
-  std::unique_ptr<network_hints::PrescientNetworkingDispatcher>
-      prescient_networking_dispatcher_;
-
 #if defined(ENABLE_SPELLCHECK)
   std::unique_ptr<SpellCheck> spellcheck_;
 #endif

chrome/renderer/chrome_render_thread_observer.cc

@@ -37,6 +37,7 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/renderer/security_filter_peer.h"
+#include "components/network_hints/renderer/prescient_networking_dispatcher.h"
 #include "content/public/child/resource_dispatcher_delegate.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
@@ -235,7 +236,10 @@ void CreateResourceUsageReporter(
 bool ChromeRenderThreadObserver::is_incognito_process_ = false;
 
 ChromeRenderThreadObserver::ChromeRenderThreadObserver()
-    : field_trial_syncer_(this), weak_factory_(this) {
+    : field_trial_syncer_(this),
+      prescient_networking_dispatcher_(
+          new network_hints::PrescientNetworkingDispatcher()),
+      weak_factory_(this) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
@@ -283,6 +287,10 @@ bool ChromeRenderThreadObserver::OnControlMessageReceived(
   return handled;
 }
 
+void ChromeRenderThreadObserver::OnRenderProcessShutdown() {
+  prescient_networking_dispatcher_.reset();
+}
+
 void ChromeRenderThreadObserver::OnFieldTrialGroupFinalized(
     const std::string& trial_name,
     const std::string& group_name) {

chrome/renderer/chrome_render_thread_observer.h

@@ -27,6 +27,10 @@ namespace content {
 class ResourceDispatcherDelegate;
 }
 
+namespace network_hints {
+class PrescientNetworkingDispatcher;
+}
+
 // This class filters the incoming control messages (i.e. ones not destined for
 // a RenderView) for Chrome specific messages that the content layer doesn't
 // happen.  If a few messages are related, they should probably have their own
@@ -43,13 +47,19 @@ class ChromeRenderThreadObserver : public content::RenderThreadObserver,
   // |ChromeRenderThreadObserver|.
   const RendererContentSettingRules* content_setting_rules() const;
 
+  network_hints::PrescientNetworkingDispatcher*
+  prescient_networking_dispatcher() {
+    return prescient_networking_dispatcher_.get();
+  }
+
  private:
   // Initializes field trial state change observation and notifies the browser
   // of any field trials that might have already been activated.
   void InitFieldTrialObserving(const base::CommandLine& command_line);
 
   // content::RenderThreadObserver:
   bool OnControlMessageReceived(const IPC::Message& message) override;
+  void OnRenderProcessShutdown() override;
 
   // base::FieldTrialList::Observer:
   void OnFieldTrialGroupFinalized(const std::string& trial_name,
@@ -68,6 +78,9 @@ class ChromeRenderThreadObserver : public content::RenderThreadObserver,
   RendererContentSettingRules content_setting_rules_;
   chrome_variations::ChildProcessFieldTrialSyncer field_trial_syncer_;
 
+  std::unique_ptr<network_hints::PrescientNetworkingDispatcher>
+      prescient_networking_dispatcher_;
+
   base::WeakPtrFactory<ChromeRenderThreadObserver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeRenderThreadObserver);

chromecast/browser/cast_content_browser_client.cc

@@ -38,7 +38,7 @@
 #include "chromecast/public/media/media_pipeline_backend.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_handler_host_linux.h"
-#include "components/network_hints/browser/network_hints_message_filter.h"
+#include "components/network_hints/browser/network_hints_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/certificate_request_result_type.h"
 #include "content/public/browser/client_certificate_delegate.h"
@@ -52,6 +52,7 @@
 #include "content/public/common/web_preferences.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gl/gl_switches.h"
@@ -209,26 +210,32 @@ void CastContentBrowserClient::RenderProcessWillLaunch(
   // getting HostResolver.
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&net::URLRequestContextGetter::GetURLRequestContext,
-                 base::Unretained(
-                    url_request_context_factory_->GetSystemGetter())),
-      base::Bind(&CastContentBrowserClient::AddNetworkHintsMessageFilter,
+      base::Bind(
+          &net::URLRequestContextGetter::GetURLRequestContext,
+          base::Unretained(url_request_context_factory_->GetSystemGetter())),
+      base::Bind(&CastContentBrowserClient::AddNetworkHintsImpl,
                  base::Unretained(this), host->GetID()));
 }
 
-void CastContentBrowserClient::AddNetworkHintsMessageFilter(
-    int render_process_id, net::URLRequestContext* context) {
+void CastContentBrowserClient::AddNetworkHintsImpl(
+    int render_process_id,
+    net::URLRequestContext* context) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   content::RenderProcessHost* host =
       content::RenderProcessHost::FromID(render_process_id);
   if (!host)
     return;
 
-  scoped_refptr<content::BrowserMessageFilter> network_hints_message_filter(
-      new network_hints::NetworkHintsMessageFilter(
-          url_request_context_factory_->host_resolver()));
-  host->AddFilter(network_hints_message_filter.get());
+  network_hints_.reset(new network_hints::NetworkHintsImpl(
+      url_request_context_factory_->host_resolver()));
+  // The client outlives the host, which owns the registry, and thus
+  // |network_hints_| will outlive the registry.
+  host->GetInterfaceRegistry()->AddInterface(
+      base::Bind(&network_hints::NetworkHintsImpl::Bind,
+                 base::Unretained(network_hints_.get())),
+      content::BrowserThread::GetTaskRunnerForThread(
+          content::BrowserThread::IO));
 }
 
 bool CastContentBrowserClient::IsHandledURL(const GURL& url) {

chromecast/browser/cast_content_browser_client.h

@@ -28,6 +28,10 @@ namespace metrics {
 class MetricsService;
 }
 
+namespace network_hints {
+class NetworkHintsImpl;
+}
+
 namespace chromecast {
 class CastService;
 
@@ -170,8 +174,8 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
   }
 
  private:
-  void AddNetworkHintsMessageFilter(int render_process_id,
-                                    net::URLRequestContext* context);
+  void AddNetworkHintsImpl(int render_process_id,
+                           net::URLRequestContext* context);
 
   net::X509Certificate* SelectClientCertificateOnIOThread(
       GURL requesting_url,
@@ -193,6 +197,8 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
   CastBrowserMainParts* cast_browser_main_parts_;
   std::unique_ptr<URLRequestContextFactory> url_request_context_factory_;
 
+  std::unique_ptr<network_hints::NetworkHintsImpl> network_hints_;
+
   DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
 };