Remove coercive comparisons of base::UkmSourceId

Bug: 873866
Change-Id: I36b283ee1f2b7dbe878834c2083a1383fda6ddca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2471799Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Commit-Queue: Yue Ru Sun <yrsun@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819146}

base/metrics/ukm_source_id.h

@@ -76,11 +76,6 @@ class BASE_EXPORT UkmSourceId {
     return value_ != other.value_;
   }
 
-  // Allow coercive comparisons to simplify test migration.
-  // TODO(crbug/873866): Remove these once callers are migrated.
-  constexpr bool operator==(int64_t other) const { return value_ == other; }
-  constexpr bool operator!=(int64_t other) const { return value_ == other; }
-
   // Extract the Type of the SourceId.
   Type GetType() const;
 

chrome/browser/extensions/extension_protocols_unittest.cc

@@ -319,7 +319,7 @@ class ExtensionProtocolsTestBase : public testing::Test {
           entries,
       ExtensionResourceAccessResult expected) {
     ASSERT_EQ(1u, entries.size());
-    EXPECT_EQ(test_ukm_id_, entries[0].source);
+    EXPECT_EQ(test_ukm_id_.ToInt64(), entries[0].source);
     ASSERT_EQ(1u, entries[0].metrics.size());
     EXPECT_EQ(blink::IdentifiableSurface::FromTypeAndToken(
                   blink::IdentifiableSurface::Type::kExtensionFileAccess,