Convert first contentful paint logging to the new UKM client API

components/ukm/ukm_source.h

 // 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.
 
 #ifndef COMPONENTS_UKM_UKM_SOURCE_H_
 #define COMPONENTS_UKM_UKM_SOURCE_H_
 
 #include <stddef.h>
 #include <map>
 
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "content/public/browser/global_request_id.h"
 #include "url/gurl.h"
 
 namespace ukm {
 
 class Source;
 
 // Contains UKM data for a single navigation entry.
 class UkmSource {
  public:
   UkmSource();
   ~UkmSource();
 
   const content::GlobalRequestID& id() const { return id_; }
   void set_id(const content::GlobalRequestID& id) { id_ = id; }
 
-  const GURL& committed_url() const { return committed_url_; }
-  void set_committed_url(const GURL& committed_url) {
-    committed_url_ = committed_url;
-  }
-
-  base::TimeDelta first_contentful_paint() const {
-    return first_contentful_paint_;
-  }
-  void set_first_contentful_paint(base::TimeDelta first_contentful_paint) {
-    first_contentful_paint_ = first_contentful_paint;
-  }
+  const GURL& url() const { return url_; }
+  void set_url(const GURL& url) { url_ = url; }
 
   // Serializes the members of the class into the supplied proto.
-  void PopulateProto(Source* proto_source);
+  void PopulateProto(Source* proto_source) const;
 
   // Get the hashed source ID, which is the hash of the child and request id
   // pairs from content::GlobalRequestID.
   static int32_t GetHashedSourceID(const content::GlobalRequestID& id);
 
  private:
   content::GlobalRequestID id_;
-  GURL committed_url_;
-  base::TimeDelta first_contentful_paint_;
+  GURL url_;
 
   DISALLOW_COPY_AND_ASSIGN(UkmSource);
 };
 
 }  // namespace ukm
 
 #endif  // COMPONENTS_UKM_UKM_SOURCE_H_