[ash-md] Added a delay between system menu default/detailed view transitions.

base/test/test_mock_time_task_runner.cc

 // Copyright 2015 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 "base/test/test_mock_time_task_runner.h"
 
+#include <algorithm>
+
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
+#include "base/message_loop/message_loop.h"
+#include "base/threading/thread_task_runner_handle.h"

[gab, 2016/11/15 22:02:06]

rm includes added for impl which moved (as well as impl itself)

[bruthig, 2016/11/15 22:17:58]

Done.

 #include "base/time/clock.h"
 #include "base/time/tick_clock.h"
 
 namespace base {
 
 namespace {
 
 // MockTickClock --------------------------------------------------------------
 
 // TickClock that always returns the then-current mock time ticks of
@@ skipping 145 matching lines @@
 std::unique_ptr<Clock> TestMockTimeTaskRunner::GetMockClock() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return MakeUnique<MockClock>(this);
 }
 
 std::unique_ptr<TickClock> TestMockTimeTaskRunner::GetMockTickClock() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return MakeUnique<MockTickClock>(this);
 }
 
+std::deque<TestPendingTask> TestMockTimeTaskRunner::TakePendingTasks() {
+  std::deque<TestPendingTask> tasks;
+  while (!tasks_.empty()) {
+    tasks.push_back(tasks_.top());
+    tasks_.pop();
+  }

[gab, 2016/11/15 22:02:06]

Use std::move like TestSimpleTaskRunner does?
https://cs.chromium.org/chromium/src/base/test/test_simple_task_runner.cc?rcl...

[bruthig, 2016/11/15 22:17:58]

Unless I'm missing something that won't work because
TestMockTimeTaskRunner::tasks_ is of type TaskPriorityQueue whereas
TestSimpleTaskRunner::pending_tasks_ is of type std::deque<TestPendingTask>.

+  return tasks;
+}
+
 bool TestMockTimeTaskRunner::HasPendingTask() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return !tasks_.empty();
 }
 
 size_t TestMockTimeTaskRunner::GetPendingTaskCount() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return tasks_.size();
 }
 
@@ skipping 73 matching lines @@
   AutoLock scoped_lock(tasks_lock_);
   if (!tasks_.empty() &&
       (tasks_.top().GetTimeToRun() - reference) <= max_delta) {
     *next_task = tasks_.top();
     tasks_.pop();
     return true;
   }
   return false;
 }
 
+// ScopedTestMockTimeTaskRunner -----------------------------------------------
+
+ScopedMockTaskRunnerWrapper::ScopedMockTaskRunnerWrapper() {
+  task_runner_ = new base::TestMockTimeTaskRunner;
+  previous_task_runner_ = base::ThreadTaskRunnerHandle::Get();
+  base::MessageLoop::current()->SetTaskRunner(task_runner_);
+}
+
+ScopedMockTaskRunnerWrapper::~ScopedMockTaskRunnerWrapper() {
+  DCHECK_EQ(task_runner_, base::ThreadTaskRunnerHandle::Get());
+  task_runner_->ClearPendingTasks();
+  base::MessageLoop::current()->SetTaskRunner(previous_task_runner_);
+}
+
 }  // namespace base