Land Recent QUIC Changes.

net/quic/test_tools/test_task_runner.h

 // 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.
 //
 // Common utilities for Quic tests
 
 #ifndef NET_QUIC_TEST_TOOLS_TEST_TASK_RUNNER_H_
 #define NET_QUIC_TEST_TOOLS_TEST_TASK_RUNNER_H_
 
 #include <vector>
@@ skipping 18 matching lines @@
   virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
                                const base::Closure& task,
                                base::TimeDelta delay) OVERRIDE;
   virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
 
   const std::vector<PostedTask>& GetPostedTasks() const;
 
   void RunNextTask();
 
  protected:
-  virtual ~TestTaskRunner();
+  virtual ~TestTaskRunner() OVERRIDE;
 
  private:
   std::vector<PostedTask>::iterator FindNextTask();
 
   MockClock* const clock_;
   std::vector<PostedTask> tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTaskRunner);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_TEST_TASK_RUNNER_H_