Rename Dns prefetching files to Predictor files...

chrome/browser/net/predictor_api.cc

 // Copyright (c) 2006-2010 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/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 
 #include <map>
 #include <string>
 
 #include "base/singleton.h"
 #include "base/stats_counters.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "base/values.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/io_thread.h"
-#include "chrome/browser/net/dns_host_info.h"
+#include "chrome/browser/net/url_info.h"
 #include "chrome/browser/net/preconnect.h"
 #include "chrome/browser/net/referrer.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/host_resolver.h"
 #include "net/base/host_resolver_impl.h"
@@ skipping 267 matching lines @@
 
 //------------------------------------------------------------------------------
 // Member definitions for above Observer class.
 
 void PrefetchObserver::OnStartResolution(
     int request_id,
     const net::HostResolver::RequestInfo& request_info) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   if (request_info.is_speculative())
     return;  // One of our own requests.
-  DCHECK_NE(0U, request_info.hostname().length());
+  if (!request_info.hostname().length())
+    return;  // PAC scripts may create queries without a hostname.
 
   UrlInfo navigation_info;
   // TODO(jar): Remove hack which guestimates ssl via port number, and perhaps
   // have actual URL passed down in request_info instead.
   bool is_ssl(443 == request_info.port());
   std::string url_spec = is_ssl ? "https://" : "http://";
   url_spec += request_info.hostname();
   url_spec += ":";
   url_spec += IntToString(request_info.port());
   navigation_info.SetUrl(GURL(url_spec));
   navigation_info.SetStartedState();
 
   // This entry will be deleted either by OnFinishResolutionWithStatus(), or
   // by  OnCancelResolution().
   resolutions_[request_id] = navigation_info;
 }
 
 void PrefetchObserver::OnFinishResolutionWithStatus(
     int request_id,
     bool was_resolved,
     const net::HostResolver::RequestInfo& request_info) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   if (request_info.is_speculative())
     return;  // One of our own requests.
+  if (!request_info.hostname().length())
+    return;  // PAC scripts may create queries without a hostname.
   UrlInfo navigation_info;
   size_t startup_count = 0;
   {
     ObservedResolutionMap::iterator it = resolutions_.find(request_id);
     if (resolutions_.end() == it) {
       NOTREACHED();
       return;
     }
     navigation_info = it->second;
     resolutions_.erase(it);
@@ skipping 19 matching lines @@
   // page load (once we start to persist elements of our referrer tree).
   StartupListAppend(navigation_info);
 }
 
 void PrefetchObserver::OnCancelResolution(
     int request_id,
     const net::HostResolver::RequestInfo& request_info) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   if (request_info.is_speculative())
     return;  // One of our own requests.
+  if (!request_info.hostname().length())
+    return;  // PAC scripts may create queries without a hostname.
 
   // Remove the entry from |resolutions| that was added by OnStartResolution().
   ObservedResolutionMap::iterator it = resolutions_.find(request_id);
   if (resolutions_.end() == it) {
     NOTREACHED();
     return;
   }
   resolutions_.erase(it);
 }
 
@@ skipping 359 matching lines @@
         TimeDelta::FromMilliseconds(max_queueing_delay_ms));
 
     DCHECK(!predictor);
     InitNetworkPredictor(max_queueing_delay, max_concurrent, user_prefs,
                          local_state, preconnect_enabled);
   }
 }
 
 
 }  // namespace chrome_browser_net