Revert 97465 - Revert 97446 - Modifying prefetch to account for multi-profile.

chrome/browser/net/predictor_unittest.cc

 // Copyright (c) 2011 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 <time.h>
 
 #include <algorithm>
 #include <sstream>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/timer.h"
 #include "base/values.h"
-#include "chrome/browser/net/predictor_api.h"
+#include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/url_info.h"
 #include "chrome/common/net/predictor_common.h"
 #include "content/browser/browser_thread.h"
 #include "net/base/address_list.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/winsock_init.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
@@ skipping 28 matching lines @@
 
  private:
   Predictor* predictor_;
   const UrlList hosts_;
   HelperTimer* timer_;
 };
 
 class PredictorTest : public testing::Test {
  public:
   PredictorTest()
-      : io_thread_(BrowserThread::IO, &loop_),
-        host_resolver_(new net::MockCachingHostResolver()),
-        default_max_queueing_delay_(TimeDelta::FromMilliseconds(
-            PredictorInit::kMaxSpeculativeResolveQueueDelayMs)) {
+      : ui_thread_(BrowserThread::UI, &loop_),
+        io_thread_(BrowserThread::IO, &loop_),
+        host_resolver_(new net::MockCachingHostResolver()) {
   }
 
  protected:
   virtual void SetUp() {
 #if defined(OS_WIN)
     net::EnsureWinsockInit();
 #endif
+    Predictor::set_max_parallel_resolves(
+        Predictor::kMaxSpeculativeParallelResolves);
+    Predictor::set_max_queueing_delay(
+        Predictor::kMaxSpeculativeResolveQueueDelayMs);
     // Since we are using a caching HostResolver, the following latencies will
     // only be incurred by the first request, after which the result will be
     // cached internally by |host_resolver_|.
     net::RuleBasedHostResolverProc* rules = host_resolver_->rules();
     rules->AddRuleWithLatency("www.google.com", "127.0.0.1", 50);
     rules->AddRuleWithLatency("gmail.google.com.com", "127.0.0.1", 70);
     rules->AddRuleWithLatency("mail.google.com", "127.0.0.1", 44);
     rules->AddRuleWithLatency("gmail.com", "127.0.0.1", 63);
   }
 
   void WaitForResolution(Predictor* predictor, const UrlList& hosts) {
     HelperTimer* timer = new HelperTimer();
     timer->Start(TimeDelta::FromMilliseconds(100),
                  new WaitForResolutionHelper(predictor, hosts, timer),
                  &WaitForResolutionHelper::Run);
     MessageLoop::current()->Run();
   }
 
  private:
   // IMPORTANT: do not move this below |host_resolver_|; the host resolver
   // must not outlive the message loop, otherwise bad things can happen
   // (like posting to a deleted message loop).
-  MessageLoop loop_;
+  MessageLoopForUI loop_;
+  BrowserThread ui_thread_;
   BrowserThread io_thread_;
 
  protected:
   scoped_ptr<net::MockCachingHostResolver> host_resolver_;
-
-  // Shorthand to access TimeDelta of PredictorInit::kMaxQueueingDelayMs.
-  // (It would be a static constant... except style rules preclude that :-/ ).
-  const TimeDelta default_max_queueing_delay_;
 };
 
 //------------------------------------------------------------------------------
 
 TEST_F(PredictorTest, StartupShutdownTest) {
-  scoped_refptr<Predictor> testing_master(
-      new Predictor(host_resolver_.get(),
-                    default_max_queueing_delay_,
-                    PredictorInit::kMaxSpeculativeParallelResolves,
-                    false));
-  testing_master->Shutdown();
+  Predictor testing_master(true);
+  testing_master.Shutdown();
 }
 
 
 TEST_F(PredictorTest, ShutdownWhenResolutionIsPendingTest) {
   scoped_refptr<net::WaitingHostResolverProc> resolver_proc(
       new net::WaitingHostResolverProc(NULL));
   host_resolver_->Reset(resolver_proc);
 
-  scoped_refptr<Predictor> testing_master(
-      new Predictor(host_resolver_.get(),
-                    default_max_queueing_delay_,
-                    PredictorInit::kMaxSpeculativeParallelResolves,
-                    false));
+  Predictor testing_master(true);
+  testing_master.SetHostResolver(host_resolver_.get());
 
   GURL localhost("http://localhost:80");
   UrlList names;
   names.push_back(localhost);
 
-  testing_master->ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED);
+  testing_master.ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED);
 
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           new MessageLoop::QuitTask(), 500);
   MessageLoop::current()->Run();
 
-  EXPECT_FALSE(testing_master->WasFound(localhost));
+  EXPECT_FALSE(testing_master.WasFound(localhost));
 
-  testing_master->Shutdown();
+  testing_master.Shutdown();
 
   // Clean up after ourselves.
   resolver_proc->Signal();
   MessageLoop::current()->RunAllPending();
 }
 
 TEST_F(PredictorTest, SingleLookupTest) {
-  scoped_refptr<Predictor> testing_master(
-      new Predictor(host_resolver_.get(),
-                    default_max_queueing_delay_,
-                    PredictorInit::kMaxSpeculativeParallelResolves,
-                    false));
+  Predictor testing_master(true);
+  testing_master.SetHostResolver(host_resolver_.get());
 
   GURL goog("http://www.google.com:80");
 
   UrlList names;
   names.push_back(goog);
 
   // Try to flood the predictor with many concurrent requests.
   for (int i = 0; i < 10; i++)
-    testing_master->ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED);
+    testing_master.ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED);
 
-  WaitForResolution(testing_master, names);
+  WaitForResolution(&testing_master, names);
 
-  EXPECT_TRUE(testing_master->WasFound(goog));
+  EXPECT_TRUE(testing_master.WasFound(goog));
 
   MessageLoop::current()->RunAllPending();
 
-  EXPECT_GT(testing_master->peak_pending_lookups(), names.size() / 2);
-  EXPECT_LE(testing_master->peak_pending_lookups(), names.size());
-  EXPECT_LE(testing_master->peak_pending_lookups(),
-            testing_master->max_concurrent_dns_lookups());
+  EXPECT_GT(testing_master.peak_pending_lookups(), names.size() / 2);
+  EXPECT_LE(testing_master.peak_pending_lookups(), names.size());
+  EXPECT_LE(testing_master.peak_pending_lookups(),
+            testing_master.max_concurrent_dns_lookups());
 
-  testing_master->Shutdown();
+  testing_master.Shutdown();
 }
 
 TEST_F(PredictorTest, ConcurrentLookupTest) {
   host_resolver_->rules()->AddSimulatedFailure("*.notfound");
 
-  scoped_refptr<Predictor> testing_master(
-      new Predictor(host_resolver_.get(),
-                    default_max_queueing_delay_,
-                    PredictorInit::kMaxSpeculativeParallelResolves,
-                    false));
+  Predictor testing_master(true);
+  testing_master.SetHostResolver(host_resolver_.get());
 
   GURL goog("http://www.google.com:80"),
       goog2("http://gmail.google.com.com:80"),
       goog3("http://mail.google.com:80"),
       goog4("http://gmail.com:80");
   GURL bad1("http://bad1.notfound:80"),
       bad2("http://bad2.notfound:80");
 
   UrlList names;
   names.push_back(goog);
   names.push_back(goog3);
   names.push_back(bad1);
   names.push_back(goog2);
   names.push_back(bad2);
   names.push_back(goog4);
   names.push_back(goog);
 
   // Try to flood the predictor with many concurrent requests.
   for (int i = 0; i < 10; i++)
-    testing_master->ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED);
+    testing_master.ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED);
 
-  WaitForResolution(testing_master, names);
+  WaitForResolution(&testing_master, names);
 
-  EXPECT_TRUE(testing_master->WasFound(goog));
-  EXPECT_TRUE(testing_master->WasFound(goog3));
-  EXPECT_TRUE(testing_master->WasFound(goog2));
-  EXPECT_TRUE(testing_master->WasFound(goog4));
-  EXPECT_FALSE(testing_master->WasFound(bad1));
-  EXPECT_FALSE(testing_master->WasFound(bad2));
+  EXPECT_TRUE(testing_master.WasFound(goog));
+  EXPECT_TRUE(testing_master.WasFound(goog3));
+  EXPECT_TRUE(testing_master.WasFound(goog2));
+  EXPECT_TRUE(testing_master.WasFound(goog4));
+  EXPECT_FALSE(testing_master.WasFound(bad1));
+  EXPECT_FALSE(testing_master.WasFound(bad2));
 
   MessageLoop::current()->RunAllPending();
 
-  EXPECT_FALSE(testing_master->WasFound(bad1));
-  EXPECT_FALSE(testing_master->WasFound(bad2));
+  EXPECT_FALSE(testing_master.WasFound(bad1));
+  EXPECT_FALSE(testing_master.WasFound(bad2));
 
-  EXPECT_LE(testing_master->peak_pending_lookups(), names.size());
-  EXPECT_LE(testing_master->peak_pending_lookups(),
-            testing_master->max_concurrent_dns_lookups());
+  EXPECT_LE(testing_master.peak_pending_lookups(), names.size());
+  EXPECT_LE(testing_master.peak_pending_lookups(),
+            testing_master.max_concurrent_dns_lookups());
 
-  testing_master->Shutdown();
+  testing_master.Shutdown();
 }
 
 TEST_F(PredictorTest, MassiveConcurrentLookupTest) {
   host_resolver_->rules()->AddSimulatedFailure("*.notfound");
 
-  scoped_refptr<Predictor> testing_master(
-      new Predictor(host_resolver_.get(),
-                    default_max_queueing_delay_,
-                    PredictorInit::kMaxSpeculativeParallelResolves,
-                    false));
+  Predictor testing_master(true);
+  testing_master.SetHostResolver(host_resolver_.get());
 
   UrlList names;
   for (int i = 0; i < 100; i++)
     names.push_back(GURL(
         "http://host" + base::IntToString(i) + ".notfound:80"));
 
   // Try to flood the predictor with many concurrent requests.
   for (int i = 0; i < 10; i++)
-    testing_master->ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED);
+    testing_master.ResolveList(names, UrlInfo::PAGE_SCAN_MOTIVATED);
 
-  WaitForResolution(testing_master, names);
+  WaitForResolution(&testing_master, names);
 
   MessageLoop::current()->RunAllPending();
 
-  EXPECT_LE(testing_master->peak_pending_lookups(), names.size());
-  EXPECT_LE(testing_master->peak_pending_lookups(),
-            testing_master->max_concurrent_dns_lookups());
+  EXPECT_LE(testing_master.peak_pending_lookups(), names.size());
+  EXPECT_LE(testing_master.peak_pending_lookups(),
+            testing_master.max_concurrent_dns_lookups());
 
-  testing_master->Shutdown();
+  testing_master.Shutdown();
 }
 
 //------------------------------------------------------------------------------
 // Functions to help synthesize and test serializations of subresource referrer
 // lists.
 
 // Return a motivation_list if we can find one for the given motivating_host (or
 // NULL if a match is not found).
 static ListValue* FindSerializationMotivation(
     const GURL& motivation, const ListValue& referral_list) {
@@ skipping 77 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 //------------------------------------------------------------------------------
 
 // Make sure nil referral lists really have no entries, and no latency listed.
 TEST_F(PredictorTest, ReferrerSerializationNilTest) {
-  scoped_refptr<Predictor> predictor(
-      new Predictor(host_resolver_.get(),
-                    default_max_queueing_delay_,
-                    PredictorInit::kMaxSpeculativeParallelResolves,
-                    false));
+  Predictor predictor(true);
+  predictor.SetHostResolver(host_resolver_.get());
+
   scoped_ptr<ListValue> referral_list(NewEmptySerializationList());
-  predictor->SerializeReferrers(referral_list.get());
+  predictor.SerializeReferrers(referral_list.get());
   EXPECT_EQ(1U, referral_list->GetSize());
   EXPECT_FALSE(GetDataFromSerialization(
     GURL("http://a.com:79"), GURL("http://b.com:78"),
       *referral_list.get(), NULL));
 
-  predictor->Shutdown();
+  predictor.Shutdown();
 }
 
 // Make sure that when a serialization list includes a value, that it can be
 // deserialized into the database, and can be extracted back out via
 // serialization without being changed.
 TEST_F(PredictorTest, ReferrerSerializationSingleReferrerTest) {
-  scoped_refptr<Predictor> predictor(
-      new Predictor(host_resolver_.get(),
-                    default_max_queueing_delay_,
-                    PredictorInit::kMaxSpeculativeParallelResolves,
-                    false));
+  Predictor predictor(true);
+  predictor.SetHostResolver(host_resolver_.get());
   const GURL motivation_url("http://www.google.com:91");
   const GURL subresource_url("http://icons.google.com:90");
   const double kUseRate = 23.4;
   scoped_ptr<ListValue> referral_list(NewEmptySerializationList());
 
   AddToSerializedList(motivation_url, subresource_url,
       kUseRate, referral_list.get());
 
-  predictor->DeserializeReferrers(*referral_list.get());
+  predictor.DeserializeReferrers(*referral_list.get());
 
   ListValue recovered_referral_list;
-  predictor->SerializeReferrers(&recovered_referral_list);
+  predictor.SerializeReferrers(&recovered_referral_list);
   EXPECT_EQ(2U, recovered_referral_list.GetSize());
   double rate;
   EXPECT_TRUE(GetDataFromSerialization(
       motivation_url, subresource_url, recovered_referral_list, &rate));
   EXPECT_EQ(rate, kUseRate);
 
-  predictor->Shutdown();
+  predictor.Shutdown();
 }
 
 // Verify that two floats are within 1% of each other in value.
 #define EXPECT_SIMILAR(a, b) do { \
     double espilon_ratio = 1.01;  \
     if ((a) < 0.)  \
       espilon_ratio = 1 / espilon_ratio;  \
     EXPECT_LT(a, espilon_ratio * (b));   \
     EXPECT_GT((a) * espilon_ratio, b);   \
     } while (0)
 
 
 // Make sure the Trim() functionality works as expected.
 TEST_F(PredictorTest, ReferrerSerializationTrimTest) {
-  scoped_refptr<Predictor> predictor(
-      new Predictor(host_resolver_.get(),
-                    default_max_queueing_delay_,
-                    PredictorInit::kMaxSpeculativeParallelResolves,
-                    false));
+  Predictor predictor(true);
+  predictor.SetHostResolver(host_resolver_.get());
   GURL motivation_url("http://www.google.com:110");
 
   GURL icon_subresource_url("http://icons.google.com:111");
   const double kRateIcon = 16.0 * Predictor::kDiscardableExpectedValue;
   GURL img_subresource_url("http://img.google.com:118");
   const double kRateImg = 8.0 * Predictor::kDiscardableExpectedValue;
 
   scoped_ptr<ListValue> referral_list(NewEmptySerializationList());
   AddToSerializedList(
       motivation_url, icon_subresource_url, kRateIcon, referral_list.get());
   AddToSerializedList(
       motivation_url, img_subresource_url, kRateImg, referral_list.get());
 
-  predictor->DeserializeReferrers(*referral_list.get());
+  predictor.DeserializeReferrers(*referral_list.get());
 
   ListValue recovered_referral_list;
-  predictor->SerializeReferrers(&recovered_referral_list);
+  predictor.SerializeReferrers(&recovered_referral_list);
   EXPECT_EQ(2U, recovered_referral_list.GetSize());
   double rate;
   EXPECT_TRUE(GetDataFromSerialization(
       motivation_url, icon_subresource_url, recovered_referral_list,
       &rate));
   EXPECT_SIMILAR(rate, kRateIcon);
 
   EXPECT_TRUE(GetDataFromSerialization(
       motivation_url, img_subresource_url, recovered_referral_list, &rate));
   EXPECT_SIMILAR(rate, kRateImg);
 
   // Each time we Trim 24 times, the user_rate figures should reduce by a factor
   // of two,  until they are small, and then a trim will delete the whole entry.
   for (int i = 0; i < 24; ++i)
-    predictor->TrimReferrersNow();
-  predictor->SerializeReferrers(&recovered_referral_list);
+    predictor.TrimReferrersNow();
+  predictor.SerializeReferrers(&recovered_referral_list);
   EXPECT_EQ(2U, recovered_referral_list.GetSize());
   EXPECT_TRUE(GetDataFromSerialization(
       motivation_url, icon_subresource_url, recovered_referral_list, &rate));
   EXPECT_SIMILAR(rate, kRateIcon / 2);
 
   EXPECT_TRUE(GetDataFromSerialization(
       motivation_url, img_subresource_url, recovered_referral_list, &rate));
   EXPECT_SIMILAR(rate, kRateImg / 2);
 
   for (int i = 0; i < 24; ++i)
-    predictor->TrimReferrersNow();
-  predictor->SerializeReferrers(&recovered_referral_list);
+    predictor.TrimReferrersNow();
+  predictor.SerializeReferrers(&recovered_referral_list);
   EXPECT_EQ(2U, recovered_referral_list.GetSize());
   EXPECT_TRUE(GetDataFromSerialization(
       motivation_url, icon_subresource_url, recovered_referral_list, &rate));
   EXPECT_SIMILAR(rate, kRateIcon / 4);
   EXPECT_TRUE(GetDataFromSerialization(
       motivation_url, img_subresource_url, recovered_referral_list, &rate));
   EXPECT_SIMILAR(rate, kRateImg / 4);
 
   for (int i = 0; i < 24; ++i)
-    predictor->TrimReferrersNow();
-  predictor->SerializeReferrers(&recovered_referral_list);
+    predictor.TrimReferrersNow();
+  predictor.SerializeReferrers(&recovered_referral_list);
   EXPECT_EQ(2U, recovered_referral_list.GetSize());
   EXPECT_TRUE(GetDataFromSerialization(
       motivation_url, icon_subresource_url, recovered_referral_list, &rate));
   EXPECT_SIMILAR(rate, kRateIcon / 8);
 
   // Img is below threshold, and so it gets deleted.
   EXPECT_FALSE(GetDataFromSerialization(
       motivation_url, img_subresource_url, recovered_referral_list, &rate));
 
   for (int i = 0; i < 24; ++i)
-    predictor->TrimReferrersNow();
-  predictor->SerializeReferrers(&recovered_referral_list);
+    predictor.TrimReferrersNow();
+  predictor.SerializeReferrers(&recovered_referral_list);
   // Icon is also trimmed away, so entire set gets discarded.
   EXPECT_EQ(1U, recovered_referral_list.GetSize());
   EXPECT_FALSE(GetDataFromSerialization(
       motivation_url, icon_subresource_url, recovered_referral_list, &rate));
   EXPECT_FALSE(GetDataFromSerialization(
       motivation_url, img_subresource_url, recovered_referral_list, &rate));
 
-  predictor->Shutdown();
+  predictor.Shutdown();
 }
 
 
 TEST_F(PredictorTest, PriorityQueuePushPopTest) {
   Predictor::HostNameQueue queue;
 
   GURL first("http://first:80"), second("http://second:90");
 
   // First check high priority queue FIFO functionality.
   EXPECT_TRUE(queue.IsEmpty());
@@ skipping 91 matching lines @@
   EXPECT_NE(Predictor::CanonicalizeUrl(http),
             Predictor::CanonicalizeUrl(https));
 
   // Https works fine.
   GURL long_https("https://host:999/path?query=value");
   EXPECT_EQ(Predictor::CanonicalizeUrl(long_https),
             long_https.GetWithEmptyPath());
 }
 
 TEST_F(PredictorTest, DiscardPredictorResults) {
-  scoped_refptr<Predictor> predictor(
-      new Predictor(host_resolver_.get(),
-                    default_max_queueing_delay_,
-                    PredictorInit::kMaxSpeculativeParallelResolves,
-                    false));
+  Predictor predictor(true);
+  predictor.SetHostResolver(host_resolver_.get());
   ListValue referral_list;
-  predictor->SerializeReferrers(&referral_list);
+  predictor.SerializeReferrers(&referral_list);
   EXPECT_EQ(1U, referral_list.GetSize());
 
   GURL host_1("http://test_1");
   GURL host_2("http://test_2");
-  predictor->LearnFromNavigation(host_1, host_2);
+  predictor.LearnFromNavigation(host_1, host_2);
 
-  predictor->SerializeReferrers(&referral_list);
+  predictor.SerializeReferrers(&referral_list);
   EXPECT_EQ(2U, referral_list.GetSize());
 
-  predictor->DiscardAllResults();
-  predictor->SerializeReferrers(&referral_list);
+  predictor.DiscardAllResults();
+  predictor.SerializeReferrers(&referral_list);
   EXPECT_EQ(1U, referral_list.GetSize());
 
-  predictor->Shutdown();
+  predictor.Shutdown();
 }
 
 }  // namespace chrome_browser_net