Strip IP addresses in NDEBUG (release) builds.

webrtc/base/ipaddress_unittest.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 870 matching lines @@
   EXPECT_FALSE(IPIsSiteLocal(teredo_addr));
   EXPECT_FALSE(IPIs6Bone(teredo_addr));
   EXPECT_FALSE(IPIs6To4(teredo_addr));
   EXPECT_FALSE(IPIsULA(teredo_addr));
   EXPECT_FALSE(IPIsV4Compatibility(teredo_addr));
   EXPECT_FALSE(IPIsV4Mapped(teredo_addr));
 }
 
 TEST(IPAddressTest, TestToSensitiveString) {
   IPAddress addr_v4 = IPAddress(kIPv4PublicAddr);
+  IPAddress addr_v6 = IPAddress(kIPv6PublicAddr);
   EXPECT_EQ(kIPv4PublicAddrString, addr_v4.ToString());
+  EXPECT_EQ(kIPv6PublicAddrString, addr_v6.ToString());
+#if defined(NDEBUG)
+  EXPECT_EQ(kIPv4PublicAddrAnonymizedString, addr_v4.ToSensitiveString());
+  EXPECT_EQ(kIPv6PublicAddrAnonymizedString, addr_v6.ToSensitiveString());
+#else
   EXPECT_EQ(kIPv4PublicAddrString, addr_v4.ToSensitiveString());
-  IPAddress::set_strip_sensitive(true);
-  EXPECT_EQ(kIPv4PublicAddrString, addr_v4.ToString());
-  EXPECT_EQ(kIPv4PublicAddrAnonymizedString, addr_v4.ToSensitiveString());
-  IPAddress::set_strip_sensitive(false);
-
-  IPAddress addr_v6 = IPAddress(kIPv6PublicAddr);
-  EXPECT_EQ(kIPv6PublicAddrString, addr_v6.ToString());
   EXPECT_EQ(kIPv6PublicAddrString, addr_v6.ToSensitiveString());
-  IPAddress::set_strip_sensitive(true);
-  EXPECT_EQ(kIPv6PublicAddrString, addr_v6.ToString());
-  EXPECT_EQ(kIPv6PublicAddrAnonymizedString, addr_v6.ToSensitiveString());
-  IPAddress::set_strip_sensitive(false);
+#endif  // defined(NDEBUG)
 }
 
 TEST(IPAddressTest, TestInterfaceAddress) {
   in6_addr addr;
   InterfaceAddress addr1(kIPv6PublicAddr,
                          IPV6_ADDRESS_FLAG_TEMPORARY);
   EXPECT_EQ(addr1.ipv6_flags(), IPV6_ADDRESS_FLAG_TEMPORARY);
   EXPECT_EQ(addr1.family(), AF_INET6);
 
   addr = addr1.ipv6_address();
@@ skipping 20 matching lines @@
   IPAddress *paddr1 = &addr1;
   IPAddress *paddr4 = &addr4;
   EXPECT_EQ(*paddr1, *paddr4);
 
   InterfaceAddress addr5(kIPv6LinkLocalAddr,
                          IPV6_ADDRESS_FLAG_TEMPORARY);
   EXPECT_NE(addr1, addr5);
 }
 
 }  // namespace rtc