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

Unified Diff: third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_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/task_queue_manager_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
index d21cd7b0259fba40e55960a2b991f26dc72934a2..5ab22a8447bfc054813862f7fe17025e86bb69ea 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
@@ -33,13 +33,13 @@
#include "platform/scheduler/base/work_queue_sets.h"
#include "testing/gmock/include/gmock/gmock.h"
-using testing::AnyNumber;
-using testing::Contains;
-using testing::ElementsAre;
-using testing::ElementsAreArray;
-using testing::Mock;
-using testing::Not;
-using testing::_;
+using ::testing::AnyNumber;
+using ::testing::Contains;
+using ::testing::ElementsAre;
+using ::testing::ElementsAreArray;
+using ::testing::Mock;
+using ::testing::Not;
+using ::testing::_;
using blink::scheduler::internal::EnqueueOrder;
namespace blink {
@@ -83,7 +83,7 @@ class MessageLoopTaskRunner : public TaskQueueManagerDelegateForTest {
~MessageLoopTaskRunner() override {}
};
-class TaskQueueManagerTest : public testing::Test {
+class TaskQueueManagerTest : public ::testing::Test {
public:
TaskQueueManagerTest() {}
void DeleteTaskQueueManager() { manager_.reset(); }
@@ -1781,7 +1781,7 @@ TEST_F(TaskQueueManagerTest, TaskQueueObserver_DelayedTaskMultipleQueues) {
.Times(1);
runners_[0]->PostDelayedTask(FROM_HERE, base::Bind(&NopTask), delay1s);
runners_[1]->PostDelayedTask(FROM_HERE, base::Bind(&NopTask), delay10s);
- testing::Mock::VerifyAndClearExpectations(&observer);
+ ::testing::Mock::VerifyAndClearExpectations(&observer);
std::unique_ptr<TaskQueue::QueueEnabledVoter> voter0 =
runners_[0]->CreateQueueEnabledVoter();

Powered by Google App Engine
This is Rietveld 408576698