Change classes and functions for DNS Prefetching to Predictor*

The DNS prefetching system has been extended to handle TCP/IP
preconnection.  As a result, class names and function names will
be migrated to variations on Predictor* and Predict* to better
indicate functionality.

This change is only meant to include name changes, comment
updates, and no semantic changes.

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

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

5 files changed, 33 insertions, 33 deletions

diff --git a/chrome/renderer/net/render_dns_master.cc b/chrome/renderer/net/render_dns_master.cc
index 6eb3d13..3393a3e 100644
--- a/chrome/renderer/net/render_dns_master.cc
+++ b/chrome/renderer/net/render_dns_master.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
-// See header file for description of RenderDnsMaster class
+// See header file for description of RendererNetPredictor class
 
 
 #include "chrome/renderer/net/render_dns_master.h"
@@ -26,13 +26,13 @@ void DnsPrefetchCString(const char* hostname, size_t length) {
 // SubmitHostsnames() (which reads names from our queue).
 static const size_t kMAX_SUBMISSION_PER_TASK = 30;
 
-RenderDnsMaster::RenderDnsMaster()
+RendererNetPredictor::RendererNetPredictor()
     : c_string_queue_(1000),
-      ALLOW_THIS_IN_INITIALIZER_LIST(render_dns_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(renderer_predictor_factory_(this)) {
   Reset();
 }
 
-void RenderDnsMaster::Reset() {
+void RendererNetPredictor::Reset() {
   domain_map_.clear();
   c_string_queue_.Clear();
   buffer_full_discard_count_ = 0;
@@ -41,7 +41,7 @@ void RenderDnsMaster::Reset() {
 }
 
 // Push names into queue quickly!
-void RenderDnsMaster::Resolve(const char* name, size_t length) {
+void RendererNetPredictor::Resolve(const char* name, size_t length) {
   if (!length)
     return;  // Don't store empty strings in buffer.
   if (is_numeric_ip(name, length))
@@ -54,10 +54,10 @@ void RenderDnsMaster::Resolve(const char* name, size_t length) {
       DCHECK_EQ(old_size, 0u);
       if (0 != old_size)
         return;  // Overkill safety net: Don't send too many InvokeLater's.
-      render_dns_factory_.RevokeAll();
+      renderer_predictor_factory_.RevokeAll();
       RenderThread::current()->message_loop()->PostDelayedTask(FROM_HERE,
-          render_dns_factory_.NewRunnableMethod(
-              &RenderDnsMaster::SubmitHostnames), 10);
+          renderer_predictor_factory_.NewRunnableMethod(
+              &RendererNetPredictor::SubmitHostnames), 10);
     }
     return;
   }
@@ -70,7 +70,7 @@ void RenderDnsMaster::Resolve(const char* name, size_t length) {
 
 // Extract data from the Queue, and then send it off the the Browser process
 // to be resolved.
-void RenderDnsMaster::SubmitHostnames() {
+void RendererNetPredictor::SubmitHostnames() {
   // Get all names out of the C_string_queue (into our map)
   ExtractBufferedNames();
   // TBD: IT could be that we should only extract about as many names as we are
@@ -88,10 +88,10 @@ void RenderDnsMaster::SubmitHostnames() {
   // This will help to avoid overloads when a page has a TON of links.
   DnsPrefetchNames(kMAX_SUBMISSION_PER_TASK);
   if (new_name_count_ > 0 || 0 < c_string_queue_.Size()) {
-    render_dns_factory_.RevokeAll();
+    renderer_predictor_factory_.RevokeAll();
     RenderThread::current()->message_loop()->PostDelayedTask(FROM_HERE,
-        render_dns_factory_.NewRunnableMethod(
-            &RenderDnsMaster::SubmitHostnames), 10);
+        renderer_predictor_factory_.NewRunnableMethod(
+            &RendererNetPredictor::SubmitHostnames), 10);
   } else {
     // TODO(JAR): Should we only clear the map when we navigate, or reload?
     domain_map_.clear();
@@ -99,7 +99,7 @@ void RenderDnsMaster::SubmitHostnames() {
 }
 
 // Pull some hostnames from the queue, and add them to our map.
-void RenderDnsMaster::ExtractBufferedNames(size_t size_goal) {
+void RendererNetPredictor::ExtractBufferedNames(size_t size_goal) {
   size_t count(0);  // Number of entries to find (0 means find all).
   if (size_goal > 0) {
     if (size_goal <= domain_map_.size())
@@ -127,7 +127,7 @@ void RenderDnsMaster::ExtractBufferedNames(size_t size_goal) {
   }
 }
 
-void RenderDnsMaster::DnsPrefetchNames(size_t max_count) {
+void RendererNetPredictor::DnsPrefetchNames(size_t max_count) {
   // We are on the renderer thread, and just need to send things to the browser.
   chrome_common_net::NameList names;
   for (DomainUseMap::iterator it = domain_map_.begin();
@@ -151,7 +151,7 @@ void RenderDnsMaster::DnsPrefetchNames(size_t max_count) {
 // is_numeric_ip() checks to see if all characters in name are either numeric,
 // or dots.  Such a name will not actually be passed to DNS, as it is an IP
 // address.
-bool RenderDnsMaster::is_numeric_ip(const char* name, size_t length) {
+bool RendererNetPredictor::is_numeric_ip(const char* name, size_t length) {
   // Scan for a character outside our lookup list.
   while (length-- > 0) {
     if (!isdigit(*name) && '.' != *name)
diff --git a/chrome/renderer/net/render_dns_master.h b/chrome/renderer/net/render_dns_master.h
index 15c100f..13f4463 100644
--- a/chrome/renderer/net/render_dns_master.h
+++ b/chrome/renderer/net/render_dns_master.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// A RenderDnsMaster instance is maintained for each RenderThread.
-// Hostnames are typically added to the embedded queue during rendering.
+// A RendererNetPredictor instance is maintained for each RenderThread.
+// URL strings are typically added to the embedded queue during rendering.
 // The first addition to the queue (transitioning from empty to having
 // some names) causes a processing task to be added to the Renderer Thread.
 // The processing task gathers all buffered names, and send them via IPC
@@ -16,7 +16,7 @@
 // If the processing task is not able to completely empty the queue, it
 // schedules a future continuation of the task, and keeps the map of already
 // sent names.  If the entire queue is processed, then the list of "sent names"
-// is cleared so that future gatherings may again pass along the same 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_
@@ -33,11 +33,11 @@
 // the Browser's global functions.
 void DnsPrefetchCString(const char* hostname, size_t length);
 
-class RenderDnsMaster {
+class RendererNetPredictor {
  public:
-  RenderDnsMaster();
+  RendererNetPredictor();
 
-  ~RenderDnsMaster() {}
+  ~RendererNetPredictor() {}
 
   // Push a name into the queue to be resolved.
   void Resolve(const char* name, size_t length);
@@ -101,9 +101,9 @@ class RenderDnsMaster {
   int buffer_full_discard_count_;
   int numeric_ip_discard_count_;
 
-  ScopedRunnableMethodFactory<RenderDnsMaster> render_dns_factory_;
+  ScopedRunnableMethodFactory<RendererNetPredictor> renderer_predictor_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(RenderDnsMaster);
-};  // class RenderDnsMaster
+  DISALLOW_COPY_AND_ASSIGN(RendererNetPredictor);
+};  // class RendererNetPredictor
 
 #endif  // CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
diff --git a/chrome/renderer/net/render_dns_master_unittest.cc b/chrome/renderer/net/render_dns_master_unittest.cc
index 0a4b637..5f5ad01 100644
--- a/chrome/renderer/net/render_dns_master_unittest.cc
+++ b/chrome/renderer/net/render_dns_master_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
-// Single threaded tests of RenderDnsMaster functionality.
+// Single threaded tests of RendererNetPredictor functionality.
 
 #include "chrome/renderer/net/render_dns_master.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -20,8 +20,8 @@ TEST(RenderDnsMasterTest, NumericIpDiscardCheck) {
   // Combination of digits plus dots.
   const std::string N1("1.3."), N2("5.5.7.12");
 
-#define TESTNAME(string) RenderDnsMaster::is_numeric_ip((string.data()), \
-                                                        (string).size())
+#define TESTNAME(string) RendererNetPredictor::is_numeric_ip((string.data()), \
+                                                             (string).size())
 
   EXPECT_TRUE(TESTNAME(N1));
   EXPECT_TRUE(TESTNAME(N2));
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 844f852..545d693 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -235,7 +235,7 @@ void RenderThread::Init() {
 
   visited_link_slave_.reset(new VisitedLinkSlave());
   user_script_slave_.reset(new UserScriptSlave());
-  dns_master_.reset(new RenderDnsMaster());
+  renderer_net_predictor_.reset(new RendererNetPredictor());
   histogram_snapshots_.reset(new RendererHistogramSnapshots());
   appcache_dispatcher_.reset(new AppCacheDispatcher(this));
   indexed_db_dispatcher_.reset(new IndexedDBDispatcher());
@@ -434,7 +434,7 @@ void RenderThread::DoNotNotifyWebKitOfModalLoop() {
 }
 
 void RenderThread::Resolve(const char* name, size_t length) {
-  return dns_master_->Resolve(name, length);
+  return renderer_net_predictor_->Resolve(name, length);
 }
 
 void RenderThread::SendHistograms(int sequence_number) {
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 0dcd7d2..5b8d024 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -34,8 +34,8 @@ class FilePath;
 class IndexedDBDispatcher;
 class ListValue;
 class NullableString16;
-class RenderDnsMaster;
 class RendererHistogram;
+class RendererNetPredictor;
 class RendererWebKitClientImpl;
 class SpellCheck;
 class SkBitmap;
@@ -310,7 +310,7 @@ class RenderThread : public RenderThreadBase,
   scoped_ptr<ScopedRunnableMethodFactory<RenderThread> > task_factory_;
   scoped_ptr<VisitedLinkSlave> visited_link_slave_;
   scoped_ptr<UserScriptSlave> user_script_slave_;
-  scoped_ptr<RenderDnsMaster> dns_master_;
+  scoped_ptr<RendererNetPredictor> renderer_net_predictor_;
   scoped_ptr<AppCacheDispatcher> appcache_dispatcher_;
   scoped_ptr<IndexedDBDispatcher> indexed_db_dispatcher_;
   scoped_refptr<DevToolsAgentFilter> devtools_agent_filter_;