[scheduler] Make scheduler mostly conform to Blink style

After patch 954622 blink style checker started checking scheduler code.
Make scheduler code mostly conform to this standard.

Add exception for readability/control_flow as in many places scheduler
code is easier to read without it.

R=dcheng@chromium.org
CC=tkent@chromium.org

Change-Id: I167ad10f089f56fd3e86d41f2a6aa07b23801557
Reviewed-on: https://chromium-review.googlesource.com/964641
Commit-Queue: Alexander Timin <altimin@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543689}

third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc

@@ -58,7 +58,7 @@ TaskQueueImpl::~TaskQueueImpl() {
   // contains a strong reference to this TaskQueueImpl and the
   // TaskQueueManagerImpl destructor calls UnregisterTaskQueue on all task
   // queues.
-  DCHECK(any_thread().task_queue_manager == nullptr)
+  DCHECK(!any_thread().task_queue_manager)
       << "UnregisterTaskQueue must be called first!";
   DCHECK(main_thread_only().on_task_started_handler.is_null());
   DCHECK(main_thread_only().on_task_completed_handler.is_null());
@@ -993,9 +993,10 @@ void TaskQueueImpl::OnTaskCompleted(
     base::TimeTicks start,
     base::TimeTicks end,
     base::Optional<base::TimeDelta> thread_time) {
-  if (!main_thread_only().on_task_completed_handler.is_null())
+  if (!main_thread_only().on_task_completed_handler.is_null()) {
     main_thread_only().on_task_completed_handler.Run(task, start, end,
                                                      thread_time);
+  }
 }
 
 bool TaskQueueImpl::RequiresTaskTiming() const {

third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_impl.cc

@@ -465,11 +465,12 @@ void TaskQueueManagerImpl::NotifyDidProcessTask(
   {
     TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("renderer.scheduler"),
                  "TaskQueueManager.QueueOnTaskCompleted");
-    if (task_start_time_sec && task_end_time_sec)
+    if (task_start_time_sec && task_end_time_sec) {
       executing_task.task_queue->OnTaskCompleted(
           executing_task.pending_task, executing_task.task_start_time,
           time_after_task->Now(),
           task_end_thread_time - executing_task.task_start_thread_time);
+    }
   }
 
   if (task_start_time_sec && task_end_time_sec &&

third_party/WebKit/Source/platform/scheduler/base/thread_controller.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_WORKER_CONTROLLER_H_
-#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_WORKER_CONTROLLER_H_
+#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_THREAD_CONTROLLER_H_
+#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_THREAD_CONTROLLER_H_
 
 #include "base/location.h"
 #include "base/run_loop.h"
@@ -91,4 +91,4 @@ class PLATFORM_EXPORT ThreadController {
 }  // namespace scheduler
 }  // namespace blink
 
-#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_WORKER_CONTROLLER_H_
+#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_THREAD_CONTROLLER_H_

third_party/WebKit/Source/platform/scheduler/base/thread_controller_impl.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_WORKER_CONTROLLER_IMPL_H_
-#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_WORKER_CONTROLLER_IMPL_H_
+#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_THREAD_CONTROLLER_IMPL_H_
+#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_THREAD_CONTROLLER_IMPL_H_
 
 #include "platform/scheduler/base/thread_controller.h"
 
@@ -129,4 +129,4 @@ class PLATFORM_EXPORT ThreadControllerImpl
 }  // namespace scheduler
 }  // namespace blink
 
-#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_WORKER_CONTROLLER_IMPL_H_
+#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_THREAD_CONTROLLER_IMPL_H_

third_party/WebKit/Source/platform/scheduler/child/idle_helper.cc

@@ -93,13 +93,11 @@ IdleHelper::IdlePeriodState IdleHelper::ComputeNewLongIdlePeriodState(
   if (long_idle_period_duration >=
       base::TimeDelta::FromMilliseconds(kMinimumIdlePeriodDurationMillis)) {
     *next_long_idle_period_delay_out = long_idle_period_duration;
-    if (!idle_queue_->HasTaskToRunImmediately()) {
+    if (!idle_queue_->HasTaskToRunImmediately())
       return IdlePeriodState::kInLongIdlePeriodPaused;
-    } else if (long_idle_period_duration == max_long_idle_period_duration) {
+    if (long_idle_period_duration == max_long_idle_period_duration)
       return IdlePeriodState::kInLongIdlePeriodWithMaxDeadline;
-    } else {
-      return IdlePeriodState::kInLongIdlePeriod;
-    }
+    return IdlePeriodState::kInLongIdlePeriod;
   } else {
     // If we can't start the idle period yet then try again after wake-up.
     *next_long_idle_period_delay_out = base::TimeDelta::FromMilliseconds(

third_party/WebKit/Source/platform/scheduler/child/page_visibility_state.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_PAGE_VISIBILITY_STATE_H_
-#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_PAGE_VISIBILITY_STATE_H_
+#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_CHILD_PAGE_VISIBILITY_STATE_H_
+#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_CHILD_PAGE_VISIBILITY_STATE_H_
 
 namespace blink {
 namespace scheduler {
@@ -16,4 +16,4 @@ const char* PageVisibilityStateToString(PageVisibilityState visibility);
 }  // namespace scheduler
 }  // namespace blink
 
-#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_PAGE_VISIBILITY_STATE_H_
+#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_CHILD_PAGE_VISIBILITY_STATE_H_

third_party/WebKit/Source/platform/scheduler/child/pollable_thread_safe_flag.cc

@@ -15,5 +15,5 @@ void PollableThreadSafeFlag::SetWhileLocked(bool value) {
 }
 
 bool PollableThreadSafeFlag::IsSet() const {
-  return base::subtle::Acquire_Load(&flag_) != false;
+  return base::subtle::Acquire_Load(&flag_);
 }

third_party/WebKit/Source/platform/scheduler/child/web_scheduler.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_WEB_SCHEDULER_H_
-#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_WEB_SCHEDULER_H_
+#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_CHILD_WEB_SCHEDULER_H_
+#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_CHILD_WEB_SCHEDULER_H_
 
 #include <memory>
 #include "base/location.h"
@@ -100,4 +100,4 @@ class PLATFORM_EXPORT WebScheduler {
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_WEB_SCHEDULER_H_
+#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_CHILD_WEB_SCHEDULER_H_

third_party/WebKit/Source/platform/scheduler/renderer/cpu_time_budget_pool.cc

@@ -91,14 +91,11 @@ base::Optional<base::TimeTicks> CPUTimeBudgetPool::GetTimeTasksCanRunUntil(
 
 base::TimeTicks CPUTimeBudgetPool::GetNextAllowedRunTime(
     base::TimeTicks desired_run_time) const {
-  if (!is_enabled_ || current_budget_level_->InMicroseconds() >= 0) {
+  if (!is_enabled_ || current_budget_level_->InMicroseconds() >= 0)
     return last_checkpoint_;
-  } else {
-    // Subtract because current_budget is negative.
-    return last_checkpoint_ +
-           (-current_budget_level_ + min_budget_level_to_run_) /
-               cpu_percentage_;
-  }
+  // Subtract because current_budget is negative.
+  return last_checkpoint_ +
+         (-current_budget_level_ + min_budget_level_to_run_) / cpu_percentage_;
 }
 
 void CPUTimeBudgetPool::RecordTaskRunTime(TaskQueue* queue,

third_party/WebKit/Source/platform/scheduler/renderer/frame_status.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_METRICS_H_
-#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_METRICS_H_
+#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_FRAME_STATUS_H_
+#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_FRAME_STATUS_H_
 
 #include "platform/PlatformExport.h"
 
@@ -82,4 +82,4 @@ PLATFORM_EXPORT FrameStatus GetFrameStatus(WebFrameScheduler* frame_scheduler);
 }  // namespace scheduler
 }  // namespace blink
 
-#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_METRICS_H_
+#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_FRAME_STATUS_H_

third_party/WebKit/Source/platform/scheduler/renderer/user_model.cc

@@ -93,15 +93,11 @@ bool UserModel::IsGestureExpectedSoonImpl(
     const base::TimeTicks now,
     base::TimeDelta* prediction_valid_duration) const {
   if (is_gesture_active_) {
-    if (IsGestureExpectedToContinue(now, prediction_valid_duration)) {
+    if (IsGestureExpectedToContinue(now, prediction_valid_duration))
       return false;
-    } else {
-      // If a gesture is not expected to continue then we expect a subsequent
-      // gesture soon.
-      *prediction_valid_duration =
-          base::TimeDelta::FromMilliseconds(kExpectSubsequentGestureMillis);
-      return true;
-    }
+    *prediction_valid_duration =
+        base::TimeDelta::FromMilliseconds(kExpectSubsequentGestureMillis);
+    return true;
   } else {
     // If we've have a finished a gesture then a subsequent gesture is deemed
     // likely.

third_party/WebKit/Source/platform/scheduler/renderer/web_frame_scheduler_impl.cc

@@ -462,9 +462,10 @@ void WebFrameSchedulerImpl::AsValueInto(
     state->SetString("loading_control_task_queue",
                      PointerToString(loading_control_task_queue_.get()));
   }
-  if (throttleable_task_queue_)
+  if (throttleable_task_queue_) {
     state->SetString("throttleable_task_queue",
                      PointerToString(throttleable_task_queue_.get()));
+  }
   if (deferrable_task_queue_) {
     state->SetString("deferrable_task_queue",
                      PointerToString(deferrable_task_queue_.get()));

third_party/WebKit/Source/platform/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.cc

@@ -64,7 +64,7 @@ void LazySchedulerMessageLoopDelegateForTests::RestoreDefaultTaskRunner() {
 }
 
 bool LazySchedulerMessageLoopDelegateForTests::HasMessageLoop() const {
-  return message_loop_ != nullptr;
+  return !!message_loop_;
 }
 
 bool LazySchedulerMessageLoopDelegateForTests::PostDelayedTask(

third_party/WebKit/Source/platform/scheduler/util/thread_cpu_throttler.cc

@@ -77,13 +77,13 @@ ThreadCPUThrottler::ThrottlingThread::ThrottlingThread(double rate)
     : throttled_thread_handle_(base::PlatformThread::CurrentHandle()) {
 #endif
   SetThrottlingRate(rate);
-  CHECK(base::subtle::NoBarrier_AtomicExchange(&thread_exists_, 1) == 0);
+  CHECK_EQ(base::subtle::NoBarrier_AtomicExchange(&thread_exists_, 1), 0);
   Start();
 }
 
 ThreadCPUThrottler::ThrottlingThread::~ThrottlingThread() {
   Stop();
-  CHECK(base::subtle::NoBarrier_AtomicExchange(&thread_exists_, 0) == 1);
+  CHECK_EQ(base::subtle::NoBarrier_AtomicExchange(&thread_exists_, 0), 1);
 }
 
 void ThreadCPUThrottler::ThrottlingThread::SetThrottlingRate(double rate) {

third_party/WebKit/Source/platform/scheduler/util/tracing_helper_unittest.cc

@@ -27,13 +27,11 @@ void ExpectNotTraced() {
 }
 
 const char* SignOfInt(int value) {
-  if (value > 0) {
+  if (value > 0)
     return "positive";
-  } else if (value < 0) {
+  if (value < 0)
     return "negative";
-  } else {
-    return "zero";
-  }
+  return "zero";
 }
 
 class TraceableStateForTest
@@ -86,10 +84,10 @@ TEST(TracingHelperTest, TraceableStateOperators) {
   x = 1;
   EXPECT_EQ(0, y - x);
   EXPECT_EQ(2, x + y);
-  EXPECT_TRUE(x == y);
+  EXPECT_EQ(x, y);
   EXPECT_FALSE(x != y);
-  EXPECT_TRUE((x + y) != 3);
-  EXPECT_TRUE((2 - y + 1 + x) == 3);
+  EXPECT_NE(x + y, 3);
+  EXPECT_EQ(2 - y + 1 + x, 3);
   x = 3;
   y = 2;
   int z = x = y;

third_party/WebKit/Tools/Scripts/webkitpy/style/checker.py

@@ -142,7 +142,8 @@ _PATH_RULES_SPECIFIER = [
         # Blink style.
         'Source/platform/scheduler',
         'public/platform/scheduler'],
-     ['-readability/parameter_name'])
+     ['-readability/parameter_name',
+      '-readability/control_flow'])
 ]