Convert some NetError[Tab]Helper messages to mojom

chrome/browser/net/net_error_tab_helper.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/browser/net/net_error_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/dns_probe_service.h"
 #include "chrome/browser/net/net_error_diagnostics_dialog.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "components/error_page/common/net_error_info.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/web_contents_interface_registry.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/net_errors.h"
 #include "url/gurl.h"
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/tab_android.h"
 #include "components/offline_pages/client_namespace_constants.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
@@ skipping 57 matching lines @@
 void NetErrorTabHelper::set_state_for_testing(TestingState state) {
   testing_state_ = state;
 }
 
 void NetErrorTabHelper::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
   // Ignore subframe creation - only main frame error pages can link to the
   // platform's network diagnostics dialog.
   if (render_frame_host->GetParent())
     return;
-  render_frame_host->Send(
-      new ChromeViewMsg_SetCanShowNetworkDiagnosticsDialog(
-          render_frame_host->GetRoutingID(),
-          CanShowNetworkDiagnosticsDialog()));
+
+  remote_network_diagnostics_client_.ForFrame(render_frame_host)

[Sam McNally, 2016/09/07 01:48:47]

Do we need to keep connections alive beyond this method?

[Ken Rockot(use gerrit already), 2016/09/07 22:48:18]

Not in this case. I've removed RemoteFrameInterface for now.

+      ->SetCanShowNetworkDiagnosticsDialog(CanShowNetworkDiagnosticsDialog());
 }
 
 void NetErrorTabHelper::DidStartNavigationToPendingEntry(
     const GURL& url,
     content::NavigationController::ReloadType reload_type) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!is_error_page_)
     return;
 
@@ skipping 61 matching lines @@
   }
 }
 
 bool NetErrorTabHelper::OnMessageReceived(
     const IPC::Message& message,
     content::RenderFrameHost* render_frame_host) {
   if (render_frame_host != web_contents()->GetMainFrame())
     return false;
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NetErrorTabHelper, message)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RunNetworkDiagnostics,
-                        RunNetworkDiagnostics)
 #if BUILDFLAG(ANDROID_JAVA_UI)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ShowOfflinePages, ShowOfflinePages)
+#else
+    case 0:  // MSVC complains if we have a switch with only a default clause.

[Sam McNally, 2016/09/07 01:48:47]

Can we move the entire message map into the #if?

[Ken Rockot(use gerrit already), 2016/09/07 22:48:18]

Done

+      return false;
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 NetErrorTabHelper::NetErrorTabHelper(WebContents* contents)
     : WebContentsObserver(contents),
+      network_diagnostics_binding_(contents, this),
       is_error_page_(false),
       dns_error_active_(false),
       dns_error_page_committed_(false),
       dns_probe_status_(error_page::DNS_PROBE_POSSIBLE),
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If this helper is under test, it won't have a WebContents.
   if (contents)
     InitializePref(contents);
@@ skipping 70 matching lines @@
 
   if (!dns_probe_status_snoop_callback_.is_null())
     dns_probe_status_snoop_callback_.Run(dns_probe_status_);
 }
 
 void NetErrorTabHelper::RunNetworkDiagnostics(const GURL& url) {
   // Only run diagnostics on HTTP or HTTPS URLs.  Shouldn't receive URLs with
   // any other schemes, but the renderer is not trusted.
   if (!url.is_valid() || !url.SchemeIsHTTPOrHTTPS())
     return;
+
   // Sanitize URL prior to running diagnostics on it.
   RunNetworkDiagnosticsHelper(url.GetOrigin().spec());
 }
 
 void NetErrorTabHelper::RunNetworkDiagnosticsHelper(
     const std::string& sanitized_url) {
+  if (web_contents()->GetInterfaces()->GetCurrentTargetFrame()
+          != web_contents()->GetMainFrame())

[Sam McNally, 2016/09/07 01:48:47]

{}

[Ken Rockot(use gerrit already), 2016/09/07 22:48:18]

Done

+    return;
+
   ShowNetworkDiagnosticsDialog(web_contents(), sanitized_url);
 }
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
 void NetErrorTabHelper::UpdateHasOfflinePages(
     content::RenderFrameHost* render_frame_host) {
   // TODO(chili): remove entirely in M55 if AsyncLoading does not need this.
   SetHasOfflinePages(render_frame_host->GetFrameTreeNodeId(), false);
 }
 
@@ skipping 21 matching lines @@
 
 bool NetErrorTabHelper::IsFromErrorPage() const {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   return entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR);
 }
 
 #endif  // BUILDFLAG(ANDROID_JAVA_UI)
 
 }  // namespace chrome_browser_net