1 files changed, 24 insertions, 25 deletions
diff --git a/chromium/components/password_manager/core/browser/password_manager_metrics_recorder_unittest.cc b/chromium/components/password_manager/core/browser/password_manager_metrics_recorder_unittest.cc
index c0be3964a91..ace6340facc 100644
--- a/chromium/components/password_manager/core/browser/password_manager_metrics_recorder_unittest.cc
+++ b/chromium/components/password_manager/core/browser/password_manager_metrics_recorder_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/test/scoped_task_environment.h"
 #include "components/ukm/test_ukm_recorder.h"
 #include "components/ukm/ukm_source.h"
-#include "services/metrics/public/cpp/ukm_recorder.h"
+#include "services/metrics/public/cpp/ukm_builders.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -22,12 +22,13 @@ namespace password_manager {
 namespace {
 
 constexpr char kTestUrl[] = "https://www.example.com/";
+constexpr ukm::SourceId kTestSourceId = 0x1234;
+
+using UkmEntry = ukm::builders::PageWithPassword;
 
 // Creates a PasswordManagerMetricsRecorder that reports metrics for kTestUrl.
-PasswordManagerMetricsRecorder CreateMetricsRecorder(
-    ukm::UkmRecorder* ukm_recorder) {
-  return PasswordManagerMetricsRecorder(
-      ukm_recorder, ukm_recorder->GetNewSourceID(), GURL(kTestUrl));
+PasswordManagerMetricsRecorder CreateMetricsRecorder() {
+  return PasswordManagerMetricsRecorder(kTestSourceId, GURL(kTestUrl));
 }
 
 }  // namespace
@@ -36,17 +37,17 @@ TEST(PasswordManagerMetricsRecorder, UserModifiedPasswordField) {
   base::test::ScopedTaskEnvironment scoped_task_environment_;
   ukm::TestAutoSetUkmRecorder test_ukm_recorder;
   {
-    PasswordManagerMetricsRecorder recorder(
-        CreateMetricsRecorder(&test_ukm_recorder));
+    PasswordManagerMetricsRecorder recorder(CreateMetricsRecorder());
     recorder.RecordUserModifiedPasswordField();
   }
 
-  const auto& entries = test_ukm_recorder.GetEntriesByName("PageWithPassword");
+  const auto& entries =
+      test_ukm_recorder.GetEntriesByName(UkmEntry::kEntryName);
   EXPECT_EQ(1u, entries.size());
   for (const auto* entry : entries) {
-    test_ukm_recorder.ExpectEntrySourceHasUrl(entry, GURL(kTestUrl));
-    test_ukm_recorder.ExpectEntryMetric(entry, kUkmUserModifiedPasswordField,
-                                        1);
+    EXPECT_EQ(kTestSourceId, entry->source_id);
+    test_ukm_recorder.ExpectEntryMetric(
+        entry, UkmEntry::kUserModifiedPasswordFieldName, 1);
   }
 }
 
@@ -54,34 +55,32 @@ TEST(PasswordManagerMetricsRecorder, UserModifiedPasswordFieldMultipleTimes) {
   base::test::ScopedTaskEnvironment scoped_task_environment_;
   ukm::TestAutoSetUkmRecorder test_ukm_recorder;
   {
-    PasswordManagerMetricsRecorder recorder(
-        CreateMetricsRecorder(&test_ukm_recorder));
+    PasswordManagerMetricsRecorder recorder(CreateMetricsRecorder());
     // Multiple calls should not create more than one entry.
     recorder.RecordUserModifiedPasswordField();
     recorder.RecordUserModifiedPasswordField();
   }
-  const auto& entries = test_ukm_recorder.GetEntriesByName("PageWithPassword");
+  const auto& entries =
+      test_ukm_recorder.GetEntriesByName(UkmEntry::kEntryName);
   EXPECT_EQ(1u, entries.size());
   for (const auto* entry : entries) {
-    test_ukm_recorder.ExpectEntrySourceHasUrl(entry, GURL(kTestUrl));
-    test_ukm_recorder.ExpectEntryMetric(entry, kUkmUserModifiedPasswordField,
-                                        1);
+    EXPECT_EQ(kTestSourceId, entry->source_id);
+    test_ukm_recorder.ExpectEntryMetric(
+        entry, UkmEntry::kUserModifiedPasswordFieldName, 1);
   }
 }
 
 TEST(PasswordManagerMetricsRecorder, UserModifiedPasswordFieldNotCalled) {
   base::test::ScopedTaskEnvironment scoped_task_environment_;
   ukm::TestAutoSetUkmRecorder test_ukm_recorder;
-  {
-    PasswordManagerMetricsRecorder recorder(
-        CreateMetricsRecorder(&test_ukm_recorder));
-  }
-  const auto& entries = test_ukm_recorder.GetEntriesByName("PageWithPassword");
+  { PasswordManagerMetricsRecorder recorder(CreateMetricsRecorder()); }
+  const auto& entries =
+      test_ukm_recorder.GetEntriesByName(UkmEntry::kEntryName);
   EXPECT_EQ(1u, entries.size());
   for (const auto* entry : entries) {
-    test_ukm_recorder.ExpectEntrySourceHasUrl(entry, GURL(kTestUrl));
-    EXPECT_FALSE(
-        test_ukm_recorder.EntryHasMetric(entry, kUkmUserModifiedPasswordField));
+    EXPECT_EQ(kTestSourceId, entry->source_id);
+    EXPECT_FALSE(test_ukm_recorder.EntryHasMetric(
+        entry, UkmEntry::kUserModifiedPasswordFieldName));
   }
 }