diff --git a/pc/peer_connection_histogram_unittest.cc b/pc/peer_connection_histogram_unittest.cc
index e36b29a..8fcb87a 100644
--- a/pc/peer_connection_histogram_unittest.cc
+++ b/pc/peer_connection_histogram_unittest.cc
@@ -32,6 +32,7 @@
 #include "pc/peer_connection_wrapper.h"
 #include "pc/sdp_utils.h"
 #include "pc/test/mock_peer_connection_observers.h"
+#include "pc/usage_pattern.h"
 #include "pc/webrtc_sdp.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
@@ -61,7 +62,7 @@
 static const rtc::SocketAddress kPrivateIpv6LocalAddress("fd12:3456:789a:1::1",
                                                          0);
 
-int MakeUsageFingerprint(std::set<PeerConnection::UsageEvent> events) {
+int MakeUsageFingerprint(std::set<UsageEvent> events) {
   int signature = 0;
   for (const auto it : events) {
     signature |= static_cast<int>(it);
@@ -418,16 +419,12 @@
   caller->pc()->Close();
   callee->pc()->Close();
   int expected_fingerprint = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::AUDIO_ADDED,
-       PeerConnection::UsageEvent::VIDEO_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::DIRECT_CONNECTION_SELECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::AUDIO_ADDED, UsageEvent::VIDEO_ADDED,
+       UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
+       UsageEvent::ICE_STATE_CONNECTED, UsageEvent::REMOTE_CANDIDATE_ADDED,
+       UsageEvent::DIRECT_CONNECTION_SELECTED, UsageEvent::CLOSE_CALLED});
   // In this case, we may or may not have PRIVATE_CANDIDATE_COLLECTED,
   // depending on the machine configuration.
   EXPECT_METRIC_EQ(2, webrtc::metrics::NumSamples(kUsagePatternMetric));
@@ -437,9 +434,7 @@
       webrtc::metrics::NumEvents(
           kUsagePatternMetric,
           expected_fingerprint |
-              static_cast<int>(
-                  PeerConnection::UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) ==
-          2);
+              static_cast<int>(UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) == 2);
 }
 
 // Test getting the usage fingerprint when the caller collects an mDNS
@@ -458,32 +453,24 @@
   callee->pc()->Close();
 
   int expected_fingerprint_caller = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::AUDIO_ADDED,
-       PeerConnection::UsageEvent::VIDEO_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::MDNS_CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::DIRECT_CONNECTION_SELECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::AUDIO_ADDED, UsageEvent::VIDEO_ADDED,
+       UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::MDNS_CANDIDATE_COLLECTED,
+       UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED, UsageEvent::ICE_STATE_CONNECTED,
+       UsageEvent::REMOTE_CANDIDATE_ADDED,
+       UsageEvent::DIRECT_CONNECTION_SELECTED, UsageEvent::CLOSE_CALLED});
 
   // Without a resolver, the callee cannot resolve the received mDNS candidate
   // but can still connect with the caller via a prflx candidate. As a result,
   // the bit for the direct connection should not be logged.
   int expected_fingerprint_callee = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::AUDIO_ADDED,
-       PeerConnection::UsageEvent::VIDEO_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::REMOTE_MDNS_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::AUDIO_ADDED, UsageEvent::VIDEO_ADDED,
+       UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
+       UsageEvent::REMOTE_MDNS_CANDIDATE_ADDED, UsageEvent::ICE_STATE_CONNECTED,
+       UsageEvent::REMOTE_CANDIDATE_ADDED, UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(2, webrtc::metrics::NumSamples(kUsagePatternMetric));
   EXPECT_METRIC_EQ(1, webrtc::metrics::NumEvents(kUsagePatternMetric,
                                                  expected_fingerprint_caller));
@@ -509,29 +496,21 @@
   // Similar to the test above, the caller connects with the callee via a prflx
   // candidate.
   int expected_fingerprint_caller = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::AUDIO_ADDED,
-       PeerConnection::UsageEvent::VIDEO_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::REMOTE_MDNS_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::AUDIO_ADDED, UsageEvent::VIDEO_ADDED,
+       UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
+       UsageEvent::REMOTE_MDNS_CANDIDATE_ADDED, UsageEvent::ICE_STATE_CONNECTED,
+       UsageEvent::REMOTE_CANDIDATE_ADDED, UsageEvent::CLOSE_CALLED});
 
   int expected_fingerprint_callee = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::AUDIO_ADDED,
-       PeerConnection::UsageEvent::VIDEO_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::MDNS_CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::DIRECT_CONNECTION_SELECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::AUDIO_ADDED, UsageEvent::VIDEO_ADDED,
+       UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::MDNS_CANDIDATE_COLLECTED,
+       UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED, UsageEvent::ICE_STATE_CONNECTED,
+       UsageEvent::REMOTE_CANDIDATE_ADDED,
+       UsageEvent::DIRECT_CONNECTION_SELECTED, UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(2, webrtc::metrics::NumSamples(kUsagePatternMetric));
   EXPECT_METRIC_EQ(1, webrtc::metrics::NumEvents(kUsagePatternMetric,
                                                  expected_fingerprint_caller));
@@ -549,15 +528,11 @@
   caller->pc()->Close();
   callee->pc()->Close();
   int expected_fingerprint = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::DATA_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::DIRECT_CONNECTION_SELECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::DATA_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
+       UsageEvent::ICE_STATE_CONNECTED, UsageEvent::REMOTE_CANDIDATE_ADDED,
+       UsageEvent::DIRECT_CONNECTION_SELECTED, UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(2, webrtc::metrics::NumSamples(kUsagePatternMetric));
   EXPECT_METRIC_TRUE(
       webrtc::metrics::NumEvents(kUsagePatternMetric, expected_fingerprint) ==
@@ -565,9 +540,7 @@
       webrtc::metrics::NumEvents(
           kUsagePatternMetric,
           expected_fingerprint |
-              static_cast<int>(
-                  PeerConnection::UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) ==
-          2);
+              static_cast<int>(UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) == 2);
 }
 #endif  // HAVE_SCTP
 #endif  // WEBRTC_ANDROID
@@ -584,10 +557,9 @@
   auto caller = CreatePeerConnection(configuration);
   ASSERT_TRUE(caller);
   caller->pc()->Close();
-  int expected_fingerprint =
-      MakeUsageFingerprint({PeerConnection::UsageEvent::STUN_SERVER_ADDED,
-                            PeerConnection::UsageEvent::TURN_SERVER_ADDED,
-                            PeerConnection::UsageEvent::CLOSE_CALLED});
+  int expected_fingerprint = MakeUsageFingerprint(
+      {UsageEvent::STUN_SERVER_ADDED, UsageEvent::TURN_SERVER_ADDED,
+       UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(1, webrtc::metrics::NumSamples(kUsagePatternMetric));
   EXPECT_METRIC_EQ(
       1, webrtc::metrics::NumEvents(kUsagePatternMetric, expected_fingerprint));
@@ -606,10 +578,9 @@
   ASSERT_TRUE(caller);
   ASSERT_TRUE(caller->pc()->SetConfiguration(configuration).ok());
   caller->pc()->Close();
-  int expected_fingerprint =
-      MakeUsageFingerprint({PeerConnection::UsageEvent::STUN_SERVER_ADDED,
-                            PeerConnection::UsageEvent::TURN_SERVER_ADDED,
-                            PeerConnection::UsageEvent::CLOSE_CALLED});
+  int expected_fingerprint = MakeUsageFingerprint(
+      {UsageEvent::STUN_SERVER_ADDED, UsageEvent::TURN_SERVER_ADDED,
+       UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(1, webrtc::metrics::NumSamples(kUsagePatternMetric));
   EXPECT_METRIC_EQ(
       1, webrtc::metrics::NumEvents(kUsagePatternMetric, expected_fingerprint));
@@ -624,28 +595,20 @@
   callee->pc()->Close();
 
   int expected_fingerprint_caller = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::AUDIO_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::PRIVATE_CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::DIRECT_CONNECTION_SELECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::AUDIO_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::PRIVATE_CANDIDATE_COLLECTED,
+       UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED, UsageEvent::ICE_STATE_CONNECTED,
+       UsageEvent::REMOTE_CANDIDATE_ADDED,
+       UsageEvent::DIRECT_CONNECTION_SELECTED, UsageEvent::CLOSE_CALLED});
 
   int expected_fingerprint_callee = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::AUDIO_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::REMOTE_PRIVATE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::DIRECT_CONNECTION_SELECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::AUDIO_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
+       UsageEvent::REMOTE_PRIVATE_CANDIDATE_ADDED,
+       UsageEvent::ICE_STATE_CONNECTED, UsageEvent::REMOTE_CANDIDATE_ADDED,
+       UsageEvent::DIRECT_CONNECTION_SELECTED, UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(2, webrtc::metrics::NumSamples(kUsagePatternMetric));
   EXPECT_METRIC_EQ(1, webrtc::metrics::NumEvents(kUsagePatternMetric,
                                                  expected_fingerprint_caller));
@@ -662,30 +625,22 @@
   callee->pc()->Close();
 
   int expected_fingerprint_caller = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::AUDIO_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::REMOTE_PRIVATE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::REMOTE_IPV6_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::DIRECT_CONNECTION_SELECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::AUDIO_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
+       UsageEvent::REMOTE_PRIVATE_CANDIDATE_ADDED,
+       UsageEvent::ICE_STATE_CONNECTED, UsageEvent::REMOTE_CANDIDATE_ADDED,
+       UsageEvent::REMOTE_IPV6_CANDIDATE_ADDED,
+       UsageEvent::DIRECT_CONNECTION_SELECTED, UsageEvent::CLOSE_CALLED});
 
   int expected_fingerprint_callee = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::AUDIO_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::PRIVATE_CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::IPV6_CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::DIRECT_CONNECTION_SELECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::AUDIO_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::PRIVATE_CANDIDATE_COLLECTED,
+       UsageEvent::IPV6_CANDIDATE_COLLECTED,
+       UsageEvent::ADD_ICE_CANDIDATE_SUCCEEDED,
+       UsageEvent::REMOTE_CANDIDATE_ADDED, UsageEvent::ICE_STATE_CONNECTED,
+       UsageEvent::DIRECT_CONNECTION_SELECTED, UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(2, webrtc::metrics::NumSamples(kUsagePatternMetric));
   EXPECT_METRIC_EQ(1, webrtc::metrics::NumEvents(kUsagePatternMetric,
                                                  expected_fingerprint_caller));
@@ -747,27 +702,20 @@
   // with the callee via a prflx candidate and hence no direct connection bit
   // should be set.
   int expected_fingerprint_caller = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::DATA_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::PRIVATE_CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::IPV6_CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::DATA_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::PRIVATE_CANDIDATE_COLLECTED,
+       UsageEvent::IPV6_CANDIDATE_COLLECTED, UsageEvent::ICE_STATE_CONNECTED,
+       UsageEvent::CLOSE_CALLED});
 
   int expected_fingerprint_callee = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::DATA_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::MDNS_CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::REMOTE_PRIVATE_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::REMOTE_IPV6_CANDIDATE_ADDED,
-       PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
-       PeerConnection::UsageEvent::DIRECT_CONNECTION_SELECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::DATA_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::SET_REMOTE_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::MDNS_CANDIDATE_COLLECTED,
+       UsageEvent::REMOTE_CANDIDATE_ADDED,
+       UsageEvent::REMOTE_PRIVATE_CANDIDATE_ADDED,
+       UsageEvent::REMOTE_IPV6_CANDIDATE_ADDED, UsageEvent::ICE_STATE_CONNECTED,
+       UsageEvent::DIRECT_CONNECTION_SELECTED, UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(2, webrtc::metrics::NumSamples(kUsagePatternMetric));
   EXPECT_METRIC_EQ(1, webrtc::metrics::NumEvents(kUsagePatternMetric,
                                                  expected_fingerprint_caller));
@@ -781,16 +729,13 @@
   caller->GenerateOfferAndCollectCandidates();
   caller->pc()->Close();
   int expected_fingerprint = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::DATA_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::DATA_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(1, webrtc::metrics::NumSamples(kUsagePatternMetric));
   EXPECT_METRIC_TRUE(
       expected_fingerprint == ObservedFingerprint() ||
       (expected_fingerprint |
-       static_cast<int>(
-           PeerConnection::UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) ==
+       static_cast<int>(UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) ==
           ObservedFingerprint());
   EXPECT_METRIC_EQ(absl::make_optional(ObservedFingerprint()),
                    caller->observer()->interesting_usage_detected());
@@ -801,9 +746,8 @@
   caller->CreateDataChannel("foo");
   caller->GenerateOfferAndCollectCandidates();
   int expected_fingerprint = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::DATA_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED});
+      {UsageEvent::DATA_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED});
   EXPECT_METRIC_EQ(0, webrtc::metrics::NumSamples(kUsagePatternMetric));
   caller->GetInternalPeerConnection()->RequestUsagePatternReportForTesting();
   EXPECT_METRIC_EQ_WAIT(1, webrtc::metrics::NumSamples(kUsagePatternMetric),
@@ -811,8 +755,7 @@
   EXPECT_METRIC_TRUE(
       expected_fingerprint == ObservedFingerprint() ||
       (expected_fingerprint |
-       static_cast<int>(
-           PeerConnection::UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) ==
+       static_cast<int>(UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) ==
           ObservedFingerprint());
   EXPECT_METRIC_EQ(absl::make_optional(ObservedFingerprint()),
                    caller->observer()->interesting_usage_detected());
@@ -824,10 +767,8 @@
   caller->CreateDataChannel("foo");
   caller->GenerateOfferAndCollectCandidates();
   int expected_fingerprint = MakeUsageFingerprint(
-      {PeerConnection::UsageEvent::DATA_ADDED,
-       PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
-       PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
-       PeerConnection::UsageEvent::CLOSE_CALLED});
+      {UsageEvent::DATA_ADDED, UsageEvent::SET_LOCAL_DESCRIPTION_SUCCEEDED,
+       UsageEvent::CANDIDATE_COLLECTED, UsageEvent::CLOSE_CALLED});
   EXPECT_METRIC_EQ(0, webrtc::metrics::NumSamples(kUsagePatternMetric));
   caller->pc()->Close();
   EXPECT_METRIC_EQ(1, webrtc::metrics::NumSamples(kUsagePatternMetric));
@@ -838,8 +779,7 @@
   EXPECT_METRIC_TRUE(
       expected_fingerprint == ObservedFingerprint() ||
       (expected_fingerprint |
-       static_cast<int>(
-           PeerConnection::UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) ==
+       static_cast<int>(UsageEvent::PRIVATE_CANDIDATE_COLLECTED)) ==
           ObservedFingerprint());
   // After close, the usage-detection callback should NOT have been called.
   EXPECT_METRIC_FALSE(caller->observer()->interesting_usage_detected());