Split Closure part of TestPendingTask out of the struct

extensions/common/one_shot_event_unittest.cc

 // Copyright 2013 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 "extensions/common/one_shot_event.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 17 matching lines @@
   scoped_refptr<base::TestSimpleTaskRunner> runner(
       new base::TestSimpleTaskRunner);
   int i = 0;
   event.Post(FROM_HERE, base::Bind(&Increment, &i), runner);
   event.Post(FROM_HERE, base::Bind(&Increment, &i), runner);
   EXPECT_EQ(0U, runner->NumPendingTasks());
   event.Signal();
 
   auto pending_tasks = runner->TakePendingTasks();
   ASSERT_EQ(2U, pending_tasks.size());
-  EXPECT_NE(pending_tasks[0].location.line_number(),
-            pending_tasks[1].location.line_number())
+  EXPECT_NE(pending_tasks[0].first.location.line_number(),
+            pending_tasks[1].first.location.line_number())
       << "Make sure FROM_HERE is propagated.";
 }
 
 TEST(OneShotEventTest, CallsQueue) {
   OneShotEvent event;
   scoped_refptr<base::TestSimpleTaskRunner> runner(
       new base::TestSimpleTaskRunner);
   int i = 0;
   event.Post(FROM_HERE, base::Bind(&Increment, &i), runner);
   event.Post(FROM_HERE, base::Bind(&Increment, &i), runner);
@@ skipping 68 matching lines @@
   EXPECT_EQ(1U, runner->NumPendingTasks());
   EXPECT_EQ(0, i);
   runner->RunPendingTasks();
   // Increment has run.
   EXPECT_EQ(0U, runner->NumPendingTasks());
   EXPECT_EQ(1, i);
 }
 
 }  // namespace
 }  // namespace extensions