| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/common/time_helper.h" | 5 #include "mojo/message_pump/time_helper.h" |
| 6 | 6 |
| 7 #include "base/time/tick_clock.h" | 7 #include "base/time/tick_clock.h" |
| 8 | 8 |
| 9 namespace mojo { | 9 namespace mojo { |
| 10 namespace common { | 10 namespace common { |
| 11 | 11 |
| 12 namespace { | 12 namespace { |
| 13 | 13 |
| 14 base::TickClock* tick_clock = NULL; | 14 base::TickClock* tick_clock = NULL; |
| 15 | 15 |
| 16 } // namespace | 16 } // namespace |
| 17 | 17 |
| 18 namespace test { | 18 namespace test { |
| 19 | 19 |
| 20 void SetTickClockForTest(base::TickClock* clock) { | 20 void SetTickClockForTest(base::TickClock* clock) { |
| 21 tick_clock = clock; | 21 tick_clock = clock; |
| 22 } | 22 } |
| 23 } // namespace test | 23 } // namespace test |
| 24 | 24 |
| 25 namespace internal { | 25 namespace internal { |
| 26 | 26 |
| 27 base::TimeTicks NowTicks() { | 27 base::TimeTicks NowTicks() { |
| 28 return tick_clock ? tick_clock->NowTicks() : base::TimeTicks::Now(); | 28 return tick_clock ? tick_clock->NowTicks() : base::TimeTicks::Now(); |
| 29 } | 29 } |
| 30 | 30 |
| 31 } // namespace internal | 31 } // namespace internal |
| 32 } // namespace common | 32 } // namespace common |
| 33 } // namespace mojo | 33 } // namespace mojo |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1262173005:
Straightens outs DEPS in mojo/common (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master