ServiceWorker: Move tracking code to count only pages controlled by SW

content/browser/service_worker/service_worker_controllee_request_handler.cc

Index: content/browser/service_worker/service_worker_controllee_request_handler.cc
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc
index 3cc931ad6c64790292baa3258b0a9490f88bb87c..382ece5ebd2700d02cadf5e26453b266c440eb69 100644
--- a/content/browser/service_worker/service_worker_controllee_request_handler.cc
+++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -148,8 +148,6 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
   }
   DCHECK(registration.get());
 
-  ServiceWorkerMetrics::CountControlledPageLoad();
-
   // Initiate activation of a waiting version.
   // Usually a register job initiates activation but that
   // doesn't happen if the browser exits prior to activation
@@ -191,6 +189,8 @@ ServiceWorkerControlleeRequestHandler::DidLookupRegistrationForMainResource(
     return;
   }
 
+  ServiceWorkerMetrics::CountControlledPageLoad();
+
   provider_host_->AssociateRegistration(registration.get());
   job_->ForwardToServiceWorker();
   TRACE_EVENT_ASYNC_END2(
@@ -211,6 +211,9 @@ void ServiceWorkerControlleeRequestHandler::OnVersionStatusChanged(
     job_->FallbackToNetwork();
     return;
   }
+
+  ServiceWorkerMetrics::CountControlledPageLoad();
+
   provider_host_->AssociateRegistration(registration);
   job_->ForwardToServiceWorker();
 }