Template methods on Timer classes instead of the classes themselves.

chrome/browser/net/predictor_unittest.cc

 // Copyright (c) 2012 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>
 
@@ skipping 21 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
 
 namespace chrome_browser_net {
 
 class WaitForResolutionHelper;
 
-typedef base::RepeatingTimer<WaitForResolutionHelper> HelperTimer;

[danakj, 2015/09/22 00:49:27]

I dropped this typedef also, and just use a RepeatingTimer* everywhere below.

-
 class WaitForResolutionHelper {
  public:
-  WaitForResolutionHelper(Predictor* predictor, const UrlList& hosts,
-                          HelperTimer* timer, int checks_until_quit)
+  WaitForResolutionHelper(Predictor* predictor,
+                          const UrlList& hosts,
+                          base::RepeatingTimer* timer,
+                          int checks_until_quit)
       : predictor_(predictor),
         hosts_(hosts),
         timer_(timer),
-        checks_until_quit_(checks_until_quit) {
-  }
+        checks_until_quit_(checks_until_quit) {}
 
   void CheckIfResolutionsDone() {
     if (--checks_until_quit_ > 0) {
       for (UrlList::const_iterator i = hosts_.begin(); i != hosts_.end(); ++i)
         if (predictor_->GetResolutionDuration(*i) ==
             UrlInfo::NullDuration())
           return;  // We don't have resolution for that host.
     }
 
     // When all hostnames have been resolved, or we've hit the limit,
     // exit the loop.
     timer_->Stop();
     base::MessageLoop::current()->Quit();
     delete timer_;
     delete this;
   }
 
  private:
   Predictor* predictor_;
   const UrlList hosts_;
-  HelperTimer* timer_;
+  base::RepeatingTimer* timer_;
   int checks_until_quit_;
 };
 
 class PredictorTest : public testing::Test {
  public:
   PredictorTest()
       : ui_thread_(BrowserThread::UI, &loop_),
         io_thread_(BrowserThread::IO, &loop_),
         host_resolver_(new net::MockCachingHostResolver()) {
   }
@@ skipping 11 matching lines @@
     // 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();
+    base::RepeatingTimer* timer = new base::RepeatingTimer();
     // By default allow the loop to run for a minute -- 600 iterations.
     timer->Start(FROM_HERE, TimeDelta::FromMilliseconds(100),
                  new WaitForResolutionHelper(predictor, hosts, timer, 600),
                  &WaitForResolutionHelper::CheckIfResolutionsDone);
     base::MessageLoop::current()->Run();
   }
 
   void WaitForResolutionWithLimit(
       Predictor* predictor, const UrlList& hosts, int limit) {
-    HelperTimer* timer = new HelperTimer();
+    base::RepeatingTimer* timer = new base::RepeatingTimer();
     timer->Start(FROM_HERE, TimeDelta::FromMilliseconds(100),
                  new WaitForResolutionHelper(predictor, hosts, timer, limit),
                  &WaitForResolutionHelper::CheckIfResolutionsDone);
     base::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).
@@ skipping 712 matching lines @@
   testing_master.Resolve(goog, UrlInfo::OMNIBOX_MOTIVATED);
 
   // Proxy may not be in use (the PAC script has not yet been evaluated), so the
   // name has been registered for pre-resolve.
   EXPECT_FALSE(testing_master.work_queue_.IsEmpty());
 
   testing_master.Shutdown();
 }
 
 }  // namespace chrome_browser_net