Rename Dns prefetching files to Predictor files

We are now doing more than DNS pre-resolution, and want
to do TCP/IP pre-warming.  This change uses the updated
class names etc., and tries to use Predictor as the
common element in most names.

r=mbelshe
Review URL: http://codereview.chromium.org/2866026

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

37 files changed, 71 insertions, 70 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 1a736ac..bf676e6 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_omnibox_api.h"
 #include "chrome/browser/metrics/user_metrics.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index afe5117..a7f0bcf 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -30,7 +30,7 @@
 #include "chrome/browser/google_service_auth_error.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/metrics/histogram_synchronizer.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index ac231bb..7c13be2 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/first_run.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/pref_service.h"
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index a954eec..a23397d 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -42,7 +42,7 @@
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/histogram_synchronizer.h"
 #include "chrome/browser/metrics/metrics_service.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/metadata_url_request.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h"
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 251a4f0..8f45a15 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -27,7 +27,7 @@
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/page_info_model.h"
 #include "chrome/browser/password_manager/password_manager.h"
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 486dd1e..83db336 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -31,7 +31,7 @@
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/metrics/metrics_service.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index 373b47f..f49f844 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -31,7 +31,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/chrome_plugin_lib.h"
-#include "net/dns_global.h"
+#include "net/predictor_api.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/rlz/rlz.h"
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index 3707ebe..a86031e 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -36,7 +36,7 @@
 #include "chrome/browser/managed_prefs_banner_base.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/metrics/user_metrics.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/options_util.h"
diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc
index 03f4524..6d06209 100644
--- a/chrome/browser/gtk/options/advanced_contents_gtk.cc
+++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc
@@ -30,7 +30,7 @@
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/options/content_settings_window_gtk.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/options_page_base.h"
 #include "chrome/browser/options_util.h"
 #include "chrome/browser/pref_member.h"
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index faa40e7..681bb9d 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/net/chrome_net_log.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/passive_log_collector.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/url_fetcher.h"
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 60e3a40..2c609f5 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -13,7 +13,7 @@
 #include "base/task.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
-#include "chrome/common/net/dns.h"
+#include "chrome/common/net/predictor_common.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "net/base/host_resolver.h"
 
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 143d1e9..ade8d0f 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/privacy_blacklist/blacklist.h"
 #include "chrome/browser/privacy_blacklist/blacklist_request_info.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/net/connect_interceptor.cc b/chrome/browser/net/connect_interceptor.cc
index d96a070..7415ac1 100644
--- a/chrome/browser/net/connect_interceptor.cc
+++ b/chrome/browser/net/connect_interceptor.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/net/connect_interceptor.h"
 
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 
 namespace chrome_browser_net {
 
diff --git a/chrome/browser/net/dns_master.cc b/chrome/browser/net/predictor.cc
index 63e0772..6bb2330 100644
--- a/chrome/browser/net/dns_master.cc
+++ b/chrome/browser/net/predictor.cc
@@ -2,7 +2,7 @@
 // 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_master.h"
+#include "chrome/browser/net/predictor.h"
 
 #include <algorithm>
 #include <set>
diff --git a/chrome/browser/net/dns_master.h b/chrome/browser/net/predictor.h
index c059f86..d1467a8 100644
--- a/chrome/browser/net/dns_master.h
+++ b/chrome/browser/net/predictor.h
@@ -16,8 +16,8 @@
 // cause this module to speculatively create a TCP/IP connection that will
 // probably be needed to fetch the subresource.
 
-#ifndef CHROME_BROWSER_NET_DNS_MASTER_H_
-#define CHROME_BROWSER_NET_DNS_MASTER_H_
+#ifndef CHROME_BROWSER_NET_PREDICTOR_H_
+#define CHROME_BROWSER_NET_PREDICTOR_H_
 
 #include <map>
 #include <queue>
@@ -27,9 +27,9 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/net/dns_host_info.h"
+#include "chrome/browser/net/url_info.h"
 #include "chrome/browser/net/referrer.h"
-#include "chrome/common/net/dns.h"
+#include "chrome/common/net/predictor_common.h"
 #include "net/base/host_port_pair.h"
 
 namespace net {
@@ -264,4 +264,4 @@ class Predictor : public base::RefCountedThreadSafe<Predictor> {
 
 }  // namespace chrome_browser_net
 
-#endif  // CHROME_BROWSER_NET_DNS_MASTER_H_
+#endif  // CHROME_BROWSER_NET_PREDICTOR_H_
diff --git a/chrome/browser/net/dns_global.cc b/chrome/browser/net/predictor_api.cc
index 48bedfc..06b7a9d 100644
--- a/chrome/browser/net/dns_global.cc
+++ b/chrome/browser/net/predictor_api.cc
@@ -2,7 +2,7 @@
 // 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>
@@ -18,7 +18,7 @@
 #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"
diff --git a/chrome/browser/net/dns_global.h b/chrome/browser/net/predictor_api.h
index cc15734..0992fc3 100644
--- a/chrome/browser/net/dns_global.h
+++ b/chrome/browser/net/predictor_api.h
@@ -8,8 +8,8 @@
 // provided by Predictor to be left as more generally usable code, and possibly
 // be shared across multiple client projects.
 
-#ifndef CHROME_BROWSER_NET_DNS_GLOBAL_H_
-#define CHROME_BROWSER_NET_DNS_GLOBAL_H_
+#ifndef CHROME_BROWSER_NET_PREDICTOR_API_H_
+#define CHROME_BROWSER_NET_PREDICTOR_API_H_
 
 
 #include <string>
@@ -18,7 +18,7 @@
 #include "base/field_trial.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
-#include "chrome/browser/net/dns_master.h"
+#include "chrome/browser/net/predictor.h"
 #include "net/base/host_resolver.h"
 
 class PrefService;
@@ -99,4 +99,4 @@ class PredictorInit {
 
 }  // namespace chrome_browser_net
 
-#endif  // CHROME_BROWSER_NET_DNS_GLOBAL_H_
+#endif  // CHROME_BROWSER_NET_PREDICTOR_API_H_
diff --git a/chrome/browser/net/dns_master_unittest.cc b/chrome/browser/net/predictor_unittest.cc
index a918384..d60961e 100644
--- a/chrome/browser/net/dns_master_unittest.cc
+++ b/chrome/browser/net/predictor_unittest.cc
@@ -13,9 +13,9 @@
 #include "base/string_util.h"
 #include "base/timer.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/net/dns_global.h"
-#include "chrome/browser/net/dns_host_info.h"
-#include "chrome/common/net/dns.h"
+#include "chrome/browser/net/predictor_api.h"
+#include "chrome/browser/net/url_info.h"
+#include "chrome/common/net/predictor_common.h"
 #include "net/base/address_list.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/winsock_init.h"
diff --git a/chrome/browser/net/dns_host_info.cc b/chrome/browser/net/url_info.cc
index 5d1824e..002c4b7 100644
--- a/chrome/browser/net/dns_host_info.cc
+++ b/chrome/browser/net/url_info.cc
@@ -2,7 +2,7 @@
 // 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_host_info.h"
+#include "chrome/browser/net/url_info.h"
 
 #include <math.h>
 
diff --git a/chrome/browser/net/dns_host_info.h b/chrome/browser/net/url_info.h
index 3ab9694..a9b56f3 100644
--- a/chrome/browser/net/dns_host_info.h
+++ b/chrome/browser/net/url_info.h
@@ -13,8 +13,8 @@
 // may describe associated subresources, for future speculative connections to
 // those expected subresources.
 
-#ifndef CHROME_BROWSER_NET_DNS_HOST_INFO_H_
-#define CHROME_BROWSER_NET_DNS_HOST_INFO_H_
+#ifndef CHROME_BROWSER_NET_URL_INFO_H_
+#define CHROME_BROWSER_NET_URL_INFO_H_
 
 #include <string>
 #include <vector>
@@ -205,4 +205,4 @@ class UrlInfo {
 
 }  // namespace chrome_browser_net
 
-#endif  // CHROME_BROWSER_NET_DNS_HOST_INFO_H_
+#endif  // CHROME_BROWSER_NET_URL_INFO_H_
diff --git a/chrome/browser/net/dns_host_info_unittest.cc b/chrome/browser/net/url_info_unittest.cc
index ba6964f..3126cb9 100644
--- a/chrome/browser/net/dns_host_info_unittest.cc
+++ b/chrome/browser/net/url_info_unittest.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/platform_thread.h"
-#include "chrome/browser/net/dns_host_info.h"
+#include "chrome/browser/net/url_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 9733f96..8985d79 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -31,7 +31,7 @@
 #include "chrome/browser/metrics/histogram_synchronizer.h"
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 #include "chrome/browser/plugin_service.h"
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index b93cd6f..d23a19f 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -25,7 +25,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/gears_integration.h"
-#include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/options_util.h"
 #include "chrome/browser/pref_member.h"
 #include "chrome/browser/pref_service.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5c5946e..a7eedfd 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1760,18 +1760,16 @@
         'browser/net/connect_interceptor.h',
         'browser/net/connection_tester.cc',
         'browser/net/connection_tester.h',
-        'browser/net/dns_global.cc',
-        'browser/net/dns_global.h',
-        'browser/net/dns_host_info.cc',
-        'browser/net/dns_host_info.h',
-        'browser/net/dns_master.cc',
-        'browser/net/dns_master.h',
         'browser/net/metadata_url_request.cc',
         'browser/net/metadata_url_request.h',
         'browser/net/passive_log_collector.cc',
         'browser/net/passive_log_collector.h',
         'browser/net/preconnect.cc',
         'browser/net/preconnect.h',
+        'browser/net/predictor.cc',
+        'browser/net/predictor.h',
+        'browser/net/predictor_api.cc',
+        'browser/net/predictor_api.h',
         'browser/net/referrer.cc',
         'browser/net/referrer.h',
         'browser/net/resolve_proxy_msg_helper.cc',
@@ -1783,6 +1781,8 @@
         'browser/net/ssl_config_service_manager.h',
         'browser/net/url_fixer_upper.cc',
         'browser/net/url_fixer_upper.h',
+        'browser/net/url_info.cc',
+        'browser/net/url_info.h',
         'browser/net/url_request_failed_dns_job.cc',
         'browser/net/url_request_failed_dns_job.h',
         # TODO:  These should be moved to test_support (see below), but
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 444f881..9e5e562 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -320,10 +320,10 @@
       'target_name': 'common_net',
       'type': '<(library)',
       'sources': [
-        'common/net/dns.h',
         'common/net/http_return.h',
         'common/net/net_resource_provider.cc',
         'common/net/net_resource_provider.h',
+        'common/net/predictor_common.h',
         'common/net/socket_stream.h',
         'common/net/url_fetcher.cc',
         'common/net/url_fetcher.h',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index d240bf2..4c94873 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -64,10 +64,10 @@
         'renderer/media/audio_renderer_impl.h',
         'renderer/media/ipc_video_renderer.cc',
         'renderer/media/ipc_video_renderer.h',
-        'renderer/net/render_dns_master.cc',
-        'renderer/net/render_dns_master.h',
-        'renderer/net/render_dns_queue.cc',
-        'renderer/net/render_dns_queue.h',
+        'renderer/net/predictor_queue.cc',
+        'renderer/net/predictor_queue.h',
+        'renderer/net/renderer_net_predictor.cc',
+        'renderer/net/renderer_net_predictor.h',
         'renderer/resources/event_bindings.js',
         'renderer/resources/extension_apitest.js',
         'renderer/resources/extension_process_bindings.js',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 29c8b466..3c4ba96 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -879,11 +879,11 @@
         'browser/mock_configuration_policy_store.h',
         'browser/net/chrome_url_request_context_unittest.cc',
         'browser/net/connection_tester_unittest.cc',
-        'browser/net/dns_host_info_unittest.cc',
-        'browser/net/dns_master_unittest.cc',
         'browser/net/passive_log_collector_unittest.cc',
+        'browser/net/predictor_unittest.cc',
         'browser/net/resolve_proxy_msg_helper_unittest.cc',
         'browser/net/url_fixer_upper_unittest.cc',
+        'browser/net/url_info_unittest.cc',
         'browser/notifications/desktop_notifications_unittest.cc',
         'browser/notifications/desktop_notifications_unittest.h',
         'browser/notifications/notification_test_util.h',
@@ -1053,8 +1053,8 @@
         'renderer/extensions/json_schema_unittest.cc',
         'renderer/form_manager_unittest.cc',
         'renderer/media/audio_renderer_impl_unittest.cc',
-        'renderer/net/render_dns_master_unittest.cc',
-        'renderer/net/render_dns_queue_unittest.cc',
+        'renderer/net/predictor_queue_unittest.cc',
+        'renderer/net/renderer_predictor_unittest.cc',
         'renderer/paint_aggregator_unittest.cc',
         'renderer/pepper_devices_unittest.cc',
         'renderer/render_process_unittest.cc',
diff --git a/chrome/common/net/dns.h b/chrome/common/net/predictor_common.h
index 6e487bd..c1d995f 100644
--- a/chrome/common/net/dns.h
+++ b/chrome/common/net/predictor_common.h
@@ -5,8 +5,8 @@
 // This file has shared types used across IPC between render_dns_master.cc
 // and dns_master.cc
 
-#ifndef CHROME_COMMON_NET_DNS_H_
-#define CHROME_COMMON_NET_DNS_H_
+#ifndef CHROME_COMMON_NET_PREDICTOR_COMMON_H_
+#define CHROME_COMMON_NET_PREDICTOR_COMMON_H_
 
 #include <string>
 #include <vector>
@@ -26,4 +26,4 @@ typedef std::vector<std::string> NameList;
 typedef std::vector<GURL> UrlList;
 }
 
-#endif  // CHROME_COMMON_NET_DNS_H_
+#endif  // CHROME_COMMON_NET_PREDICTOR_COMMON_H_
diff --git a/chrome/renderer/net/render_dns_queue.cc b/chrome/renderer/net/predictor_queue.cc
index b805f82..40996e5 100644
--- a/chrome/renderer/net/render_dns_queue.cc
+++ b/chrome/renderer/net/predictor_queue.cc
@@ -4,7 +4,7 @@
 
 // See header file for description of DnsQueue class
 
-#include "chrome/renderer/net/render_dns_queue.h"
+#include "chrome/renderer/net/predictor_queue.h"
 
 #include "base/logging.h"
 #include "base/stats_counters.h"
diff --git a/chrome/renderer/net/render_dns_queue.h b/chrome/renderer/net/predictor_queue.h
index 78e8e36..c833ea7 100644
--- a/chrome/renderer/net/render_dns_queue.h
+++ b/chrome/renderer/net/predictor_queue.h
@@ -21,8 +21,8 @@
 // rendering, the supplier is the renderer (typically), and the consumer
 // is a thread that sends messages to an async DNS resolver.
 
-#ifndef CHROME_RENDERER_NET_RENDER_DNS_QUEUE_H__
-#define CHROME_RENDERER_NET_RENDER_DNS_QUEUE_H__
+#ifndef CHROME_RENDERER_NET_PREDICTOR_QUEUE_H__
+#define CHROME_RENDERER_NET_PREDICTOR_QUEUE_H__
 
 #include <string>
 
@@ -89,4 +89,4 @@ class DnsQueue {
   DISALLOW_COPY_AND_ASSIGN(DnsQueue);
 };  // class DnsQueue
 
-#endif  // CHROME_RENDERER_NET_RENDER_DNS_QUEUE_H__
+#endif  // CHROME_RENDERER_NET_PREDICTOR_QUEUE_H__
diff --git a/chrome/renderer/net/render_dns_queue_unittest.cc b/chrome/renderer/net/predictor_queue_unittest.cc
index eead742..98d4bde 100644
--- a/chrome/renderer/net/render_dns_queue_unittest.cc
+++ b/chrome/renderer/net/predictor_queue_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <sstream>
 
-#include "chrome/renderer/net/render_dns_queue.h"
+#include "chrome/renderer/net/predictor_queue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Single threaded tests of DnsQueue functionality.
diff --git a/chrome/renderer/net/render_dns_master.cc b/chrome/renderer/net/renderer_net_predictor.cc
index 3393a3e..7749e91 100644
--- a/chrome/renderer/net/render_dns_master.cc
+++ b/chrome/renderer/net/renderer_net_predictor.cc
@@ -5,15 +5,15 @@
 // See header file for description of RendererNetPredictor class
 
 
-#include "chrome/renderer/net/render_dns_master.h"
+#include "chrome/renderer/net/renderer_net_predictor.h"
 
 #include <ctype.h>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "chrome/common/net/dns.h"
+#include "chrome/common/net/predictor_common.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/net/render_dns_queue.h"
+#include "chrome/renderer/net/predictor_queue.h"
 #include "chrome/renderer/render_thread.h"
 
 // This API is used in the render process by renderer_glue.cc.
diff --git a/chrome/renderer/net/render_dns_master.h b/chrome/renderer/net/renderer_net_predictor.h
index 13f4463..68e5109 100644
--- a/chrome/renderer/net/render_dns_master.h
+++ b/chrome/renderer/net/renderer_net_predictor.h
@@ -18,8 +18,8 @@
 // sent names.  If the entire queue is processed, then the list of "sent names"
 // is cleared so that future gatherings might again pass along the same names.
 
-#ifndef CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
-#define CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
+#ifndef CHROME_RENDERER_NET_RENDERER_NET_PREDICTOR_H_
+#define CHROME_RENDERER_NET_RENDERER_NET_PREDICTOR_H_
 
 #include <map>
 #include <string>
@@ -27,7 +27,7 @@
 
 #include "base/basictypes.h"
 #include "base/task.h"
-#include "chrome/renderer/net/render_dns_queue.h"
+#include "chrome/renderer/net/predictor_queue.h"
 
 // Global API consists to do Prefetching in renderer.  This uses IPC to reach
 // the Browser's global functions.
@@ -106,4 +106,4 @@ class RendererNetPredictor {
   DISALLOW_COPY_AND_ASSIGN(RendererNetPredictor);
 };  // class RendererNetPredictor
 
-#endif  // CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
+#endif  // CHROME_RENDERER_NET_RENDERER_NET_PREDICTOR_H_
diff --git a/chrome/renderer/net/render_dns_master_unittest.cc b/chrome/renderer/net/renderer_predictor_unittest.cc
index 5f5ad01..a987ba0 100644
--- a/chrome/renderer/net/render_dns_master_unittest.cc
+++ b/chrome/renderer/net/renderer_predictor_unittest.cc
@@ -4,7 +4,7 @@
 
 // Single threaded tests of RendererNetPredictor functionality.
 
-#include "chrome/renderer/net/render_dns_master.h"
+#include "chrome/renderer/net/renderer_net_predictor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include <algorithm>
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 545d693..87155c3b 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -52,7 +52,7 @@
 #include "chrome/renderer/external_extension.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/loadtimes_extension_bindings.h"
-#include "chrome/renderer/net/render_dns_master.h"
+#include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/plugin_channel_host.h"
 #include "chrome/renderer/render_process_impl.h"
 #include "chrome/renderer/render_view.h"
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 87c9049..07301b5 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -24,7 +24,7 @@
 #include "chrome/common/socket_stream_dispatcher.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/plugin/npobject_util.h"
-#include "chrome/renderer/net/render_dns_master.h"
+#include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "googleurl/src/url_util.h"
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 4229d66..27329ee 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -19,7 +19,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/plugin/npobject_util.h"
-#include "chrome/renderer/net/render_dns_master.h"
+#include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_webindexeddatabase_impl.h"
@@ -173,7 +173,8 @@ void RendererWebKitClientImpl::suddenTerminationChanged(bool enabled) {
     // We should not get more enables than disables, but we want it to be a
     // non-fatal error if it does happen.
     DCHECK_GT(sudden_termination_disables_, 0);
-    sudden_termination_disables_ = std::max(sudden_termination_disables_ - 1, 0);
+    sudden_termination_disables_ = std::max(sudden_termination_disables_ - 1,
+                                            0);
     if (sudden_termination_disables_ != 0)
       return;
   } else {