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

Unified Diff: third_party/WebKit/Source/platform/scheduler/renderer/webthread_impl_for_renderer_scheduler_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/renderer/webthread_impl_for_renderer_scheduler_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc
index f57a222168675d8556f063cf7c0ba5b83acad85c..b09a7fb2be6e5c2a7f08e4a55785db01382b0cae 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/webthread_impl_for_renderer_scheduler_unittest.cc
@@ -39,7 +39,7 @@ class MockTaskObserver : public blink::WebThread::TaskObserver {
};
} // namespace
-class WebThreadImplForRendererSchedulerTest : public testing::Test {
+class WebThreadImplForRendererSchedulerTest : public ::testing::Test {
public:
WebThreadImplForRendererSchedulerTest() {}
@@ -77,7 +77,7 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestTaskObserver) {
MockTask task;
{
- testing::InSequence sequence;
+ ::testing::InSequence sequence;
EXPECT_CALL(observer, WillProcessTask());
EXPECT_CALL(task, Run());
EXPECT_CALL(observer, DidProcessTask());
@@ -96,7 +96,7 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithOneTask) {
SetWorkBatchSizeForTesting(kWorkBatchSize);
{
- testing::InSequence sequence;
+ ::testing::InSequence sequence;
EXPECT_CALL(observer, WillProcessTask());
EXPECT_CALL(task, Run());
EXPECT_CALL(observer, DidProcessTask());
@@ -116,7 +116,7 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithTwoTasks) {
SetWorkBatchSizeForTesting(kWorkBatchSize);
{
- testing::InSequence sequence;
+ ::testing::InSequence sequence;
EXPECT_CALL(observer, WillProcessTask());
EXPECT_CALL(task1, Run());
EXPECT_CALL(observer, DidProcessTask());
@@ -143,7 +143,7 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithThreeTasks) {
SetWorkBatchSizeForTesting(kWorkBatchSize);
{
- testing::InSequence sequence;
+ ::testing::InSequence sequence;
EXPECT_CALL(observer, WillProcessTask());
EXPECT_CALL(task1, Run());
EXPECT_CALL(observer, DidProcessTask());
@@ -183,7 +183,7 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestNestedRunLoop) {
thread_->AddTaskObserver(&observer);
{
- testing::InSequence sequence;
+ ::testing::InSequence sequence;
// One callback for EnterRunLoop.
EXPECT_CALL(observer, WillProcessTask());

Powered by Google App Engine
This is Rietveld 408576698