Template methods on Timer classes instead of the classes themselves.

remoting/protocol/monitored_video_stub_unittest.cc

 // Copyright 2014 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 "remoting/protocol/monitored_video_stub.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "remoting/protocol/protocol_mock_objects.h"
@@ skipping 23 matching lines @@
     EXPECT_CALL(video_stub_, ProcessVideoPacketPtr(_, _)).Times(AnyNumber());
   }
 
   MOCK_METHOD1(OnVideoChannelStatus, void(bool connected));
 
   base::MessageLoop message_loop_;
   MockVideoStub video_stub_;
 
   scoped_ptr<MonitoredVideoStub> monitor_;
   scoped_ptr<VideoPacket> packet_;
-  base::OneShotTimer<MonitoredVideoStubTest> timer_end_test_;
+  base::OneShotTimer timer_end_test_;
 };
 
 TEST_F(MonitoredVideoStubTest, OnChannelConnected) {
   EXPECT_CALL(*this, OnVideoChannelStatus(true));
   // On slow machines, the connectivity check timer may fire before the test
   // finishes, so we expect to see at most one transition to not ready.
   EXPECT_CALL(*this, OnVideoChannelStatus(false)).Times(AtMost(1));
 
   monitor_->ProcessVideoPacket(packet_.Pass(), base::Closure());
   base::RunLoop().RunUntilIdle();
@@ skipping 33 matching lines @@
   message_loop_.PostDelayedTask(
       FROM_HERE,
       base::MessageLoop::QuitClosure(),
       // The delay should be much greater than |kTestOverrideDelayMilliseconds|.
       TestTimeouts::tiny_timeout());
   message_loop_.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting