Template methods on Timer classes instead of the classes themselves.

content/renderer/resource_fetcher_browsertest.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 "content/public/renderer/resource_fetcher.h"
 
 #include <stdint.h>
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 74 matching lines @@
 
     timed_out_ = true;
     if (!completed_)
       quit_task_.Run();
     FAIL() << "fetch timed out";
   }
 
   static FetcherDelegate* instance_;
 
  private:
-  base::OneShotTimer<FetcherDelegate> timer_;
+  base::OneShotTimer timer_;
   bool completed_;
   bool timed_out_;
   WebURLResponse response_;
   std::string data_;
   base::Closure quit_task_;
 };
 
 FetcherDelegate* FetcherDelegate::instance_ = NULL;
 
 class EvilFetcherDelegate : public FetcherDelegate {
@@ skipping 275 matching lines @@
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("echoheader?header"));
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &ResourceFetcherTests::ResourceFetcherSetHeader,
             base::Unretained(this), url));
 }
 
 }  // namespace content