Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(537)

Side by Side Diff: content/browser/startup_task_runner_unittest.cc

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/startup_task_runner.h" 5 #include "content/browser/startup_task_runner.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 PostDelayedTask, 89 PostDelayedTask,
90 bool(const tracked_objects::Location&, const Closure&, base::TimeDelta)); 90 bool(const tracked_objects::Location&, const Closure&, base::TimeDelta));
91 MOCK_METHOD3( 91 MOCK_METHOD3(
92 PostNonNestableDelayedTask, 92 PostNonNestableDelayedTask,
93 bool(const tracked_objects::Location&, const Closure&, base::TimeDelta)); 93 bool(const tracked_objects::Location&, const Closure&, base::TimeDelta));
94 }; 94 };
95 95
96 class TaskRunnerProxy : public base::SingleThreadTaskRunner { 96 class TaskRunnerProxy : public base::SingleThreadTaskRunner {
97 public: 97 public:
98 TaskRunnerProxy(MockTaskRunner* mock) : mock_(mock) {} 98 TaskRunnerProxy(MockTaskRunner* mock) : mock_(mock) {}
99 virtual bool RunsTasksOnCurrentThread() const OVERRIDE { return true; } 99 virtual bool RunsTasksOnCurrentThread() const override { return true; }
100 virtual bool PostDelayedTask(const tracked_objects::Location& location, 100 virtual bool PostDelayedTask(const tracked_objects::Location& location,
101 const Closure& closure, 101 const Closure& closure,
102 base::TimeDelta delta) OVERRIDE { 102 base::TimeDelta delta) override {
103 return mock_->PostDelayedTask(location, closure, delta); 103 return mock_->PostDelayedTask(location, closure, delta);
104 } 104 }
105 virtual bool PostNonNestableDelayedTask( 105 virtual bool PostNonNestableDelayedTask(
106 const tracked_objects::Location& location, 106 const tracked_objects::Location& location,
107 const Closure& closure, 107 const Closure& closure,
108 base::TimeDelta delta) OVERRIDE { 108 base::TimeDelta delta) override {
109 return mock_->PostNonNestableDelayedTask(location, closure, delta); 109 return mock_->PostNonNestableDelayedTask(location, closure, delta);
110 } 110 }
111 111
112 private: 112 private:
113 MockTaskRunner* mock_; 113 MockTaskRunner* mock_;
114 virtual ~TaskRunnerProxy() {} 114 virtual ~TaskRunnerProxy() {}
115 }; 115 };
116 116
117 TEST_F(StartupTaskRunnerTest, SynchronousExecution) { 117 TEST_F(StartupTaskRunnerTest, SynchronousExecution) {
118 MockTaskRunner mock_runner; 118 MockTaskRunner mock_runner;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 EXPECT_EQ(observer_calls, 1); 312 EXPECT_EQ(observer_calls, 1);
313 EXPECT_EQ(observer_result, 1); 313 EXPECT_EQ(observer_result, 1);
314 314
315 // Check that running synchronously now doesn't do anything 315 // Check that running synchronously now doesn't do anything
316 runner.RunAllTasksNow(); 316 runner.RunAllTasksNow();
317 EXPECT_EQ(observer_calls, 1); 317 EXPECT_EQ(observer_calls, 1);
318 EXPECT_EQ(task_count, 1); 318 EXPECT_EQ(task_count, 1);
319 } 319 }
320 } // namespace 320 } // namespace
321 } // namespace content 321 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/site_per_process_browsertest.cc ('k') | content/browser/storage_partition_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698