Template methods on Timer classes instead of the classes themselves.

net/proxy/dhcp_proxy_script_fetcher_win_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 "net/proxy/dhcp_proxy_script_fetcher_win.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 94 matching lines @@
   // do something a bit more clever to track worker threads even when the
   // DhcpProxyScriptFetcherWin state machine has finished.
   void FinishTestAllowCleanup() {
     base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(30));
   }
 
   scoped_ptr<URLRequestContext> context_;
   scoped_ptr<DhcpProxyScriptFetcherWin> fetcher_;
   bool finished_;
   base::string16 pac_text_;
-  base::OneShotTimer<RealFetchTester> timeout_;
-  base::OneShotTimer<RealFetchTester> cancel_timer_;
+  base::OneShotTimer timeout_;
+  base::OneShotTimer cancel_timer_;
   bool on_completion_is_error_;
 };
 
 TEST(DhcpProxyScriptFetcherWin, RealFetch) {
   // This tests a call to Fetch() with no stubbing out of dependencies.
   //
   // We don't make assumptions about the environment this unit test is
   // running in, so it just exercises the code to make sure there
   // is no crash and no unexpected error returned, but does not assert on
   // results beyond that.
@@ skipping 126 matching lines @@
     pac_script_ = pac_script;
     fetch_delay_ms_ = fetch_delay_ms;
   }
 
  private:
   bool did_finish_;
   int result_;
   base::string16 pac_script_;
   int fetch_delay_ms_;
   CompletionCallback callback_;
-  base::OneShotTimer<DummyDhcpProxyScriptAdapterFetcher> timer_;
+  base::OneShotTimer timer_;
 };
 
 class MockDhcpProxyScriptFetcherWin : public DhcpProxyScriptFetcherWin {
  public:
   class MockAdapterQuery : public AdapterQuery {
    public:
     MockAdapterQuery() {
     }
 
     bool ImplGetCandidateAdapterNames(
@@ skipping 365 matching lines @@
   }
 
   // Re-do the first test to make sure the last test that was run did
   // not leave things in a bad state.
   (*test_functions.begin())(&client);
 }
 
 }  // namespace
 
 }  // namespace net