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

Side by Side Diff: base/debug/activity_tracker_unittest.cc

Issue 2791243002: Rewrite base::Bind into base::BindOnce on trivial cases in base (Closed)
Patch Set: rebase Created 3 years, 8 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
« no previous file with comments | « base/debug/activity_tracker.cc ('k') | base/debug/task_annotator_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "base/debug/activity_tracker.h" 5 #include "base/debug/activity_tracker.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 ThreadActivityTracker* tracker = 209 ThreadActivityTracker* tracker =
210 GlobalActivityTracker::Get()->GetOrCreateTrackerForCurrentThread(); 210 GlobalActivityTracker::Get()->GetOrCreateTrackerForCurrentThread();
211 ThreadActivityTracker::Snapshot snapshot; 211 ThreadActivityTracker::Snapshot snapshot;
212 ASSERT_EQ(0U, GetGlobalUserDataMemoryCacheUsed()); 212 ASSERT_EQ(0U, GetGlobalUserDataMemoryCacheUsed());
213 213
214 ASSERT_TRUE(tracker->CreateSnapshot(&snapshot)); 214 ASSERT_TRUE(tracker->CreateSnapshot(&snapshot));
215 ASSERT_EQ(0U, snapshot.activity_stack_depth); 215 ASSERT_EQ(0U, snapshot.activity_stack_depth);
216 ASSERT_EQ(0U, snapshot.activity_stack.size()); 216 ASSERT_EQ(0U, snapshot.activity_stack.size());
217 217
218 { 218 {
219 PendingTask task1(FROM_HERE, base::Bind(&DoNothing)); 219 PendingTask task1(FROM_HERE, base::BindOnce(&DoNothing));
220 ScopedTaskRunActivity activity1(task1); 220 ScopedTaskRunActivity activity1(task1);
221 ActivityUserData& user_data1 = activity1.user_data(); 221 ActivityUserData& user_data1 = activity1.user_data();
222 (void)user_data1; // Tell compiler it's been used. 222 (void)user_data1; // Tell compiler it's been used.
223 223
224 ASSERT_TRUE(tracker->CreateSnapshot(&snapshot)); 224 ASSERT_TRUE(tracker->CreateSnapshot(&snapshot));
225 ASSERT_EQ(1U, snapshot.activity_stack_depth); 225 ASSERT_EQ(1U, snapshot.activity_stack_depth);
226 ASSERT_EQ(1U, snapshot.activity_stack.size()); 226 ASSERT_EQ(1U, snapshot.activity_stack.size());
227 EXPECT_EQ(Activity::ACT_TASK, snapshot.activity_stack[0].activity_type); 227 EXPECT_EQ(Activity::ACT_TASK, snapshot.activity_stack[0].activity_type);
228 228
229 { 229 {
230 PendingTask task2(FROM_HERE, base::Bind(&DoNothing)); 230 PendingTask task2(FROM_HERE, base::BindOnce(&DoNothing));
231 ScopedTaskRunActivity activity2(task2); 231 ScopedTaskRunActivity activity2(task2);
232 ActivityUserData& user_data2 = activity2.user_data(); 232 ActivityUserData& user_data2 = activity2.user_data();
233 (void)user_data2; // Tell compiler it's been used. 233 (void)user_data2; // Tell compiler it's been used.
234 234
235 ASSERT_TRUE(tracker->CreateSnapshot(&snapshot)); 235 ASSERT_TRUE(tracker->CreateSnapshot(&snapshot));
236 ASSERT_EQ(2U, snapshot.activity_stack_depth); 236 ASSERT_EQ(2U, snapshot.activity_stack_depth);
237 ASSERT_EQ(2U, snapshot.activity_stack.size()); 237 ASSERT_EQ(2U, snapshot.activity_stack.size());
238 EXPECT_EQ(Activity::ACT_TASK, snapshot.activity_stack[1].activity_type); 238 EXPECT_EQ(Activity::ACT_TASK, snapshot.activity_stack[1].activity_type);
239 } 239 }
240 240
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 ThreadActivityTracker* thread = global->GetOrCreateTrackerForCurrentThread(); 406 ThreadActivityTracker* thread = global->GetOrCreateTrackerForCurrentThread();
407 407
408 // Get callbacks for process exit. 408 // Get callbacks for process exit.
409 global->SetProcessExitCallback( 409 global->SetProcessExitCallback(
410 Bind(&ActivityTrackerTest::HandleProcessExit, Unretained(this))); 410 Bind(&ActivityTrackerTest::HandleProcessExit, Unretained(this)));
411 411
412 // Pretend than another process has started. 412 // Pretend than another process has started.
413 global->RecordProcessLaunch(other_process_id, FILE_PATH_LITERAL("foo --bar")); 413 global->RecordProcessLaunch(other_process_id, FILE_PATH_LITERAL("foo --bar"));
414 414
415 // Do some activities. 415 // Do some activities.
416 PendingTask task(FROM_HERE, base::Bind(&DoNothing)); 416 PendingTask task(FROM_HERE, base::BindOnce(&DoNothing));
417 ScopedTaskRunActivity activity(task); 417 ScopedTaskRunActivity activity(task);
418 ActivityUserData& user_data = activity.user_data(); 418 ActivityUserData& user_data = activity.user_data();
419 ASSERT_NE(0U, user_data.id()); 419 ASSERT_NE(0U, user_data.id());
420 420
421 // Get the memory-allocator references to that data. 421 // Get the memory-allocator references to that data.
422 PersistentMemoryAllocator::Reference proc_data_ref = 422 PersistentMemoryAllocator::Reference proc_data_ref =
423 global->allocator()->GetAsReference( 423 global->allocator()->GetAsReference(
424 global->process_data().GetBaseAddress(), 424 global->process_data().GetBaseAddress(),
425 GlobalActivityTracker::kTypeIdProcessDataRecord); 425 GlobalActivityTracker::kTypeIdProcessDataRecord);
426 ASSERT_TRUE(proc_data_ref); 426 ASSERT_TRUE(proc_data_ref);
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 global->allocator()->ChangeType( 493 global->allocator()->ChangeType(
494 tracker_ref, GlobalActivityTracker::kTypeIdActivityTracker, 494 tracker_ref, GlobalActivityTracker::kTypeIdActivityTracker,
495 GlobalActivityTracker::kTypeIdActivityTrackerFree, false); 495 GlobalActivityTracker::kTypeIdActivityTrackerFree, false);
496 global->allocator()->ChangeType( 496 global->allocator()->ChangeType(
497 user_data_ref, GlobalActivityTracker::kTypeIdUserDataRecord, 497 user_data_ref, GlobalActivityTracker::kTypeIdUserDataRecord,
498 GlobalActivityTracker::kTypeIdUserDataRecordFree, false); 498 GlobalActivityTracker::kTypeIdUserDataRecordFree, false);
499 } 499 }
500 500
501 } // namespace debug 501 } // namespace debug
502 } // namespace base 502 } // namespace base
OLDNEW
« no previous file with comments | « base/debug/activity_tracker.cc ('k') | base/debug/task_annotator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698