Refactor UKM interface for mojo-ification

components/ukm/debug_page/debug_page.cc

Index: components/ukm/debug_page/debug_page.cc
diff --git a/components/ukm/debug_page/debug_page.cc b/components/ukm/debug_page/debug_page.cc
index c3fb9e8d881afbac2fc178ae8714cfffc74c931a..aa40092c917bb2fec90cb73ad3b62fc836062d8a 100644
--- a/components/ukm/debug_page/debug_page.cc
+++ b/components/ukm/debug_page/debug_page.cc
@@ -8,7 +8,6 @@
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/stringprintf.h"
-#include "components/ukm/ukm_entry.h"
 #include "components/ukm/ukm_service.h"
 #include "components/ukm/ukm_source.h"
 #include "url/gurl.h"
@@ -57,15 +56,15 @@ void DebugPage::StartDataRequest(
     data.append("<h2>Sources</h2>");
     for (const auto& kv : ukm_service->sources_) {
       const auto* src = kv.second.get();
-      data.append(base::StringPrintf("<p>Id:%d Url:%s</p>", src->id(),
+      data.append(base::StringPrintf("<p>Id:%ld Url:%s</p>", src->id(),
                                      src->url().spec().c_str()));
     }
 
     data.append("<h2>Entries</h2>");
     for (const auto& v : ukm_service->entries_) {
       const auto* entry = v.get();
-      data.append(base::StringPrintf("<h3>Id:%d Hash:%" PRIu64 "</h3>",
-                                     entry->source_id(), entry->event_hash()));
+      data.append(base::StringPrintf("<h3>Id:%ld Hash:%" PRIu64 "</h3>",
+                                     entry->source_id, entry->event_hash));
     }
   }