Convert first contentful paint logging to the new UKM client API

components/ukm/ukm_service.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/ukm/ukm_service.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 211 matching lines @@
     std::unique_ptr<metrics::MetricsProvider> provider) {
   metrics_providers_.push_back(std::move(provider));
 }
 
 // static
 void UkmService::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterInt64Pref(prefs::kUkmClientId, 0);
   registry->RegisterListPref(prefs::kUkmPersistedLogs);
 }
 
+// static
+int32_t UkmService::NewSourceId() {
+  static int32_t g_source_id_provider = 0;
+  return g_source_id_provider++;
+}
+
 void UkmService::StartInitTask() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DVLOG(1) << "UkmService::StartInitTask";
   client_id_ = LoadOrGenerateClientId(pref_service_);
   client_->InitializeSystemProfileMetrics(base::Bind(
       &UkmService::FinishedInitTask, self_ptr_factory_.GetWeakPtr()));
 }
 
 void UkmService::FinishedInitTask() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 138 matching lines @@
     return;
   }
 
   // Update the pre-existing source if there is any. This happens when the
   // initial URL is different from the committed URL for the same source, e.g.,
   // when there is redirection.
   for (auto& source : sources_) {
     if (source_id != source->id())
       continue;
 
-    source->set_committed_url(url);
+    source->set_url(url);
     return;
   }
 
   if (sources_.size() >= kMaxSources) {
     RecordDroppedSource(DroppedDataReason::MAX_HIT);
     return;
   }
   std::unique_ptr<UkmSource> source = base::MakeUnique<UkmSource>();
   source->set_id(source_id);
-  source->set_committed_url(url);
+  source->set_url(url);
   sources_.push_back(std::move(source));
 }
 
 void UkmService::AddEntry(std::unique_ptr<UkmEntry> entry) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!recording_enabled_) {
     RecordDroppedEntry(DroppedDataReason::RECORDING_DISABLED);
     return;
   }
   if (entries_.size() >= kMaxEntries) {
     RecordDroppedEntry(DroppedDataReason::MAX_HIT);
     return;
   }
 
   entries_.push_back(std::move(entry));
 }
 
 }  // namespace ukm