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

Unified Diff: third_party/WebKit/Source/platform/scheduler/base/intrusive_heap_unittest.cc

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/scheduler/base/intrusive_heap_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/base/intrusive_heap_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/intrusive_heap_unittest.cc
index eb28fbb90ddd1b8ccd2a78005905a0e7187e6220..12409404593fc425ce526feb16f27cd86e532a7e 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/intrusive_heap_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/intrusive_heap_unittest.cc
@@ -278,7 +278,8 @@ TEST_F(IntrusiveHeapTest, ChangeKeyUp) {
heap.Pop();
}
- EXPECT_THAT(results, testing::ElementsAre(0, 2, 4, 6, 8, 12, 14, 16, 17, 18));
+ EXPECT_THAT(results,
+ ::testing::ElementsAre(0, 2, 4, 6, 8, 12, 14, 16, 17, 18));
}
TEST_F(IntrusiveHeapTest, ChangeKeyUpButDoesntMove) {
@@ -297,7 +298,8 @@ TEST_F(IntrusiveHeapTest, ChangeKeyUpButDoesntMove) {
heap.Pop();
}
- EXPECT_THAT(results, testing::ElementsAre(0, 2, 4, 6, 8, 11, 12, 14, 16, 18));
+ EXPECT_THAT(results,
+ ::testing::ElementsAre(0, 2, 4, 6, 8, 11, 12, 14, 16, 18));
}
TEST_F(IntrusiveHeapTest, ChangeKeyDown) {
@@ -316,7 +318,8 @@ TEST_F(IntrusiveHeapTest, ChangeKeyDown) {
heap.Pop();
}
- EXPECT_THAT(results, testing::ElementsAre(0, 1, 2, 4, 6, 8, 12, 14, 16, 18));
+ EXPECT_THAT(results,
+ ::testing::ElementsAre(0, 1, 2, 4, 6, 8, 12, 14, 16, 18));
}
TEST_F(IntrusiveHeapTest, ChangeKeyDownButDoesntMove) {
@@ -335,7 +338,8 @@ TEST_F(IntrusiveHeapTest, ChangeKeyDownButDoesntMove) {
heap.Pop();
}
- EXPECT_THAT(results, testing::ElementsAre(0, 2, 4, 6, 8, 9, 12, 14, 16, 18));
+ EXPECT_THAT(results,
+ ::testing::ElementsAre(0, 2, 4, 6, 8, 9, 12, 14, 16, 18));
}
TEST_F(IntrusiveHeapTest, ChangeKeyCheckAllFinalPositions) {

Powered by Google App Engine
This is Rietveld 408576698