Move DNS functions from net_error_info.h into error_page namespace.

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 "base/prefs/pref_service.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/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "components/error_page/common/net_error_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/net_errors.h"
 #include "url/gurl.h"
 
 using chrome_common_net::DnsProbeStatus;
-using chrome_common_net::DnsProbeStatusToString;
 using content::BrowserContext;
 using content::BrowserThread;
-using ui::PageTransition;
 using content::RenderViewHost;
 using content::WebContents;
 using content::WebContentsObserver;
+using error_page::DnsProbeStatusToString;
+using ui::PageTransition;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(chrome_browser_net::NetErrorTabHelper);
 
 namespace chrome_browser_net {
 
 namespace {
 
 static NetErrorTabHelper::TestingState testing_state_ =
     NetErrorTabHelper::TESTING_DEFAULT;
 
@@ skipping 50 matching lines @@
 void NetErrorTabHelper::DidStartNavigationToPendingEntry(
     const GURL& url,
     content::NavigationController::ReloadType reload_type) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!is_error_page_)
     return;
 
   // Only record reloads.
   if (reload_type != content::NavigationController::NO_RELOAD) {
-    chrome_common_net::RecordEvent(
+    error_page::RecordEvent(
         chrome_common_net::NETWORK_ERROR_PAGE_BROWSER_INITIATED_RELOAD);
   }
 }
 
 void NetErrorTabHelper::DidStartProvisionalLoadForFrame(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url,
     bool is_error_page,
     bool is_iframe_srcdoc) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 95 matching lines @@
       FROM_HERE,
       base::Bind(&StartDnsProbeOnIOThread,
                  base::Bind(&NetErrorTabHelper::OnDnsProbeFinished,
                             weak_factory_.GetWeakPtr()),
                  g_browser_process->io_thread()));
 }
 
 void NetErrorTabHelper::OnDnsProbeFinished(DnsProbeStatus result) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK_EQ(chrome_common_net::DNS_PROBE_STARTED, dns_probe_status_);
-  DCHECK(chrome_common_net::DnsProbeStatusIsFinished(result));
+  DCHECK(error_page::DnsProbeStatusIsFinished(result));
 
   DVLOG(1) << "Finished DNS probe with result "
            << DnsProbeStatusToString(result) << ".";
 
   dns_probe_status_ = result;
 
   if (dns_error_page_committed_)
     SendInfo();
 }
 
@@ skipping 36 matching lines @@
   // Sanitize URL prior to running diagnostics on it.
   RunNetworkDiagnosticsHelper(url.GetOrigin());
 }
 
 void NetErrorTabHelper::RunNetworkDiagnosticsHelper(
     const GURL& sanitized_url) {
   ShowNetworkDiagnosticsDialog(web_contents(), sanitized_url);
 }
 
 }  // namespace chrome_browser_net