diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-07-22 19:44:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 19:44:05 +0000 |
| commit | 2c02e87003d7aa12fb2e33e99dd0208d875485bd (patch) | |
| tree | 3e85bd82b5a0d8fd3d267d177a9511469817c939 /src/commands/command_queue_unittest.cc | |
| parent | a8a7c612c3db5af1ffd5f5e13587341387591f54 (diff) | |
| parent | 6125590925677a6fc09007d835616ba59044885d (diff) | |
| download | libweave-2c02e87003d7aa12fb2e33e99dd0208d875485bd.tar.gz | |
Merge remote-tracking branch \\\\'weave/master\\\\' into \\\\'weave/aosp-master\\\\' am: 7aaba04460 am: 50cf4188d8 am: 9454fc7df0
am: 6125590925
Change-Id: I5381d0e6c3ff6b735068072c2cbf205d90f74893
Diffstat (limited to 'src/commands/command_queue_unittest.cc')
| -rw-r--r-- | src/commands/command_queue_unittest.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/commands/command_queue_unittest.cc b/src/commands/command_queue_unittest.cc index 1e2e0ac..a590a36 100644 --- a/src/commands/command_queue_unittest.cc +++ b/src/commands/command_queue_unittest.cc @@ -151,10 +151,13 @@ TEST_F(CommandQueueTest, CleanupMultipleCommands) { queue_.Add(CreateDummyCommandInstance("base.reboot", id1)); queue_.Add(CreateDummyCommandInstance("base.reboot", id2)); - auto remove_task = [this](const std::string& id) { queue_.RemoveLater(id); }; - remove_task(id1); - task_runner_.PostDelayedTask(FROM_HERE, base::Bind(remove_task, id2), - base::TimeDelta::FromSeconds(10)); + auto remove_task = [](CommandQueue* queue, const std::string& id) { + queue->RemoveLater(id); + }; + remove_task(&queue_, id1); + task_runner_.PostDelayedTask( + FROM_HERE, base::Bind(remove_task, base::Unretained(&queue_), id2), + base::TimeDelta::FromSeconds(10)); EXPECT_EQ(2u, queue_.GetCount()); ASSERT_EQ(2u, task_runner_.GetTaskQueueSize()); task_runner_.RunOnce(); // Executes "remove_task(id2) @ T+10s". |