Use macros for ThreadChecker part 2.

BUG=None
TEST=Built locally. Ran trybots.

Change-Id: I97c13c15877ae48e03556a6ff1dfce7bc5e8f1d7
Reviewed-on: https://chromium-review.googlesource.com/544723Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org>
Commit-Queue: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#481695}

chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.cc

@@ -28,17 +28,16 @@ ArcBootPhaseMonitorBridge::ArcBootPhaseMonitorBridge(
     ArcBridgeService* bridge_service,
     const AccountId& account_id)
     : ArcService(bridge_service), account_id_(account_id), binding_(this) {
-  DCHECK(thread_checker_.CalledOnValidThread());
   arc_bridge_service()->boot_phase_monitor()->AddObserver(this);
 }
 
 ArcBootPhaseMonitorBridge::~ArcBootPhaseMonitorBridge() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   arc_bridge_service()->boot_phase_monitor()->RemoveObserver(this);
 }
 
 void ArcBootPhaseMonitorBridge::OnInstanceReady() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
       arc_bridge_service()->boot_phase_monitor(), Init);
   DCHECK(instance);
@@ -48,11 +47,11 @@ void ArcBootPhaseMonitorBridge::OnInstanceReady() {
 }
 
 void ArcBootPhaseMonitorBridge::OnInstanceClosed() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 }
 
 void ArcBootPhaseMonitorBridge::OnBootCompleted() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   VLOG(2) << "OnBootCompleted";
 
   chromeos::SessionManagerClient* session_manager_client =

chrome/browser/chromeos/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h

@@ -38,12 +38,12 @@ class ArcBootPhaseMonitorBridge
   void OnBootCompleted() override;
 
  private:
+  THREAD_CHECKER(thread_checker_);
+
   const AccountId account_id_;
   mojo::Binding<mojom::BootPhaseMonitorHost> binding_;
   std::unique_ptr<ArcInstanceThrottle> throttle_;
 
-  base::ThreadChecker thread_checker_;
-
   DISALLOW_COPY_AND_ASSIGN(ArcBootPhaseMonitorBridge);
 };
 

chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_service.cc

@@ -21,12 +21,12 @@ ArcEnterpriseReportingService::ArcEnterpriseReportingService(
 }
 
 ArcEnterpriseReportingService::~ArcEnterpriseReportingService() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   arc_bridge_service()->enterprise_reporting()->RemoveObserver(this);
 }
 
 void ArcEnterpriseReportingService::OnInstanceReady() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
       arc_bridge_service()->enterprise_reporting(), Init);
   DCHECK(instance);
@@ -37,7 +37,7 @@ void ArcEnterpriseReportingService::OnInstanceReady() {
 
 void ArcEnterpriseReportingService::ReportManagementState(
     mojom::ManagementState state) {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   VLOG(1) << "ReportManagementState state=" << state;
 
   if (state == mojom::ManagementState::MANAGED_DO_LOST) {

chrome/browser/chromeos/arc/enterprise/arc_enterprise_reporting_service.h

@@ -35,7 +35,7 @@ class ArcEnterpriseReportingService
   void ReportManagementState(mojom::ManagementState state) override;
 
  private:
-  base::ThreadChecker thread_checker_;
+  THREAD_CHECKER(thread_checker_);
 
   mojo::Binding<mojom::EnterpriseReportingHost> binding_;