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

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

Issue 2258713003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 ~ActivityTrackerTest() override { 50 ~ActivityTrackerTest() override {
51 GlobalActivityTracker* global_tracker = GlobalActivityTracker::Get(); 51 GlobalActivityTracker* global_tracker = GlobalActivityTracker::Get();
52 if (global_tracker) { 52 if (global_tracker) {
53 global_tracker->ReleaseTrackerForCurrentThreadForTesting(); 53 global_tracker->ReleaseTrackerForCurrentThreadForTesting();
54 delete global_tracker; 54 delete global_tracker;
55 } 55 }
56 } 56 }
57 57
58 std::unique_ptr<ThreadActivityTracker> CreateActivityTracker() { 58 std::unique_ptr<ThreadActivityTracker> CreateActivityTracker() {
59 std::unique_ptr<char[]> memory(new char[kStackSize]); 59 std::unique_ptr<char[]> memory(new char[kStackSize]);
60 return WrapUnique(new TestActivityTracker(std::move(memory), kStackSize)); 60 return MakeUnique<TestActivityTracker>(std::move(memory), kStackSize);
61 } 61 }
62 62
63 size_t GetGlobalActiveTrackerCount() { 63 size_t GetGlobalActiveTrackerCount() {
64 GlobalActivityTracker* global_tracker = GlobalActivityTracker::Get(); 64 GlobalActivityTracker* global_tracker = GlobalActivityTracker::Get();
65 if (!global_tracker) 65 if (!global_tracker)
66 return 0; 66 return 0;
67 return global_tracker->thread_tracker_count_.load( 67 return global_tracker->thread_tracker_count_.load(
68 std::memory_order_relaxed); 68 std::memory_order_relaxed);
69 } 69 }
70 70
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 EXPECT_EQ(starting_inactive, GetGlobalInactiveTrackerCount()); 280 EXPECT_EQ(starting_inactive, GetGlobalInactiveTrackerCount());
281 281
282 t2.Exit(); 282 t2.Exit();
283 t2.Join(); 283 t2.Join();
284 EXPECT_EQ(starting_active, GetGlobalActiveTrackerCount()); 284 EXPECT_EQ(starting_active, GetGlobalActiveTrackerCount());
285 EXPECT_EQ(starting_inactive + 1, GetGlobalInactiveTrackerCount()); 285 EXPECT_EQ(starting_inactive + 1, GetGlobalInactiveTrackerCount());
286 } 286 }
287 287
288 } // namespace debug 288 } // namespace debug
289 } // namespace base 289 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698