Revert 168650 - Glue browser-side DNS probing together. We should detect DNS errors on main frame loads, run probes, and get the results, but they won't show error pages yet.

BUG=156415
TEST=extended NetErrorTabHelper test

Review URL: https://chromiumcodereview.appspot.com/11363157

Failed compile:
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Builder/builds/11930/

In file included from ../../chrome/browser/net/dns_probe_service.cc:5:
../../chrome/browser/net/dns_probe_service.h:73:9: error: no type named 'Time' in namespace 'base'
  base::Time last_probe_time_;
  ~~~~~~^
1 error generated.

TBR=ttuttle@chromium.org
Review URL: https://codereview.chromium.org/11416084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168655 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 15 deletions

diff --git a/chrome/browser/net/net_error_tab_helper.h b/chrome/browser/net/net_error_tab_helper.h
index 4793bab..bc64bc1 100644
--- a/chrome/browser/net/net_error_tab_helper.h
+++ b/chrome/browser/net/net_error_tab_helper.h
@@ -6,9 +6,6 @@
 #define CHROME_BROWSER_NET_NET_ERROR_TAB_HELPER_H_
 
 #include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/weak_ptr.h"
-#include "chrome/browser/net/dns_probe_service.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
@@ -32,8 +29,6 @@ class NetErrorTabHelper
       const string16& error_description,
       content::RenderViewHost* render_view_host) OVERRIDE;
 
-  void OnDnsProbeFinished(DnsProbeService::Result result);
-
  protected:
   friend class content::WebContentsUserData<NetErrorTabHelper>;
 
@@ -41,25 +36,17 @@ class NetErrorTabHelper
   // attached to.
   explicit NetErrorTabHelper(content::WebContents* contents);
 
-  // Posts a task to the IO thread that will start a DNS probe.
-  virtual void PostStartDnsProbeTask();
-
-  // Checks if the "Use web service to resolve navigation errors" preference is
-  // enabled on the profile.
-  virtual bool DnsProbesAllowedByPref() const;
+  // Starts a DNS probe.
+  virtual void StartDnsProbe();
 
   bool dns_probe_running() { return dns_probe_running_; }
   void set_dns_probe_running(bool running) { dns_probe_running_ = running; }
 
  private:
-  void OnMainFrameDnsError();
-
   // Whether the tab helper has started a DNS probe that has not yet returned
   // a result.
   bool dns_probe_running_;
 
-  base::WeakPtrFactory<NetErrorTabHelper> weak_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(NetErrorTabHelper);
 };