4 files changed, 17 insertions, 17 deletions

diff --git a/absl/container/internal/raw_hash_set_test.cc b/absl/container/internal/raw_hash_set_test.cc
index 47015bcf..e7732f67 100644
--- a/absl/container/internal/raw_hash_set_test.cc
+++ b/absl/container/internal/raw_hash_set_test.cc
@@ -1258,7 +1258,8 @@ ExpectedStats XorSeedExpectedStats() {
   return {};
 }
 
-TEST(Table, EnsureNonQuadraticTopNXorSeedByProbeSeqLength) {
+// TODO(b/80415403): Figure out why this test is so flaky, esp. on MSVC
+TEST(Table, DISABLED_EnsureNonQuadraticTopNXorSeedByProbeSeqLength) {
   ProbeStatsPerSize stats;
   std::vector<size_t> sizes = {Group::kWidth << 5, Group::kWidth << 10};
   for (size_t size : sizes) {
@@ -1352,7 +1353,8 @@ ExpectedStats LinearTransformExpectedStats() {
   return {};
 }
 
-TEST(Table, EnsureNonQuadraticTopNLinearTransformByProbeSeqLength) {
+// TODO(b/80415403): Figure out why this test is so flaky.
+TEST(Table, DISABLED_EnsureNonQuadraticTopNLinearTransformByProbeSeqLength) {
   ProbeStatsPerSize stats;
   std::vector<size_t> sizes = {Group::kWidth << 5, Group::kWidth << 10};
   for (size_t size : sizes) {
diff --git a/absl/hash/hash_test.cc b/absl/hash/hash_test.cc
index cea54dc0..39ff8f52 100644
--- a/absl/hash/hash_test.cc
+++ b/absl/hash/hash_test.cc
@@ -139,10 +139,10 @@ TYPED_TEST_P(HashValueIntTest, FastPath) {
             absl::Hash<std::tuple<TypeParam>>{}(std::tuple<TypeParam>(n)));
 }
 
-REGISTER_TYPED_TEST_CASE_P(HashValueIntTest, BasicUsage, FastPath);
+REGISTER_TYPED_TEST_SUITE_P(HashValueIntTest, BasicUsage, FastPath);
 using IntTypes = testing::Types<unsigned char, char, int, int32_t, int64_t,
                                 uint32_t, uint64_t, size_t>;
-INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueIntTest, IntTypes);
+INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueIntTest, IntTypes);
 
 enum LegacyEnum { kValue1, kValue2, kValue3 };
 
@@ -507,7 +507,7 @@ TYPED_TEST_P(HashValueSequenceTest, BasicUsage) {
   EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars));
 }
 
-REGISTER_TYPED_TEST_CASE_P(HashValueSequenceTest, BasicUsage);
+REGISTER_TYPED_TEST_SUITE_P(HashValueSequenceTest, BasicUsage);
 using IntSequenceTypes = testing::Types<
     std::deque<int>, std::forward_list<int>, std::list<int>, std::vector<int>,
     std::vector<bool>, TypeErasedContainer<std::vector<int>>, std::set<int>,
@@ -515,7 +515,7 @@ using IntSequenceTypes = testing::Types<
     TypeErasedContainer<UnorderedSequence<int>>, std::unordered_set<int>,
     std::unordered_multiset<int>, absl::flat_hash_set<int>,
     absl::node_hash_set<int>, absl::btree_set<int>>;
-INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueSequenceTest, IntSequenceTypes);
+INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueSequenceTest, IntSequenceTypes);
 
 template <typename T>
 class HashValueNestedSequenceTest : public testing::Test {};
@@ -541,7 +541,7 @@ TYPED_TEST_P(HashValueNestedSequenceTest, BasicUsage) {
   EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars));
 }
 
-REGISTER_TYPED_TEST_CASE_P(HashValueNestedSequenceTest, BasicUsage);
+REGISTER_TYPED_TEST_SUITE_P(HashValueNestedSequenceTest, BasicUsage);
 template <typename T>
 using TypeErasedSet = TypeErasedContainer<UnorderedSequence<T>>;
 
@@ -551,7 +551,7 @@ using NestedIntSequenceTypes = testing::Types<
     UnorderedSequence<UnorderedSequence<int>>,
     UnorderedSequence<TypeErasedSet<int>>, TypeErasedSet<std::vector<int>>,
     TypeErasedSet<UnorderedSequence<int>>, TypeErasedSet<TypeErasedSet<int>>>;
-INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueNestedSequenceTest,
+INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueNestedSequenceTest,
                               NestedIntSequenceTypes);
 
 // Private type that only supports AbslHashValue to make sure our chosen hash
@@ -732,13 +732,13 @@ TYPED_TEST_P(HashValueAssociativeMapTest, BasicUsage) {
   EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars));
 }
 
-REGISTER_TYPED_TEST_CASE_P(HashValueAssociativeMapTest, BasicUsage);
+REGISTER_TYPED_TEST_SUITE_P(HashValueAssociativeMapTest, BasicUsage);
 using AssociativeMapTypes = testing::Types<
     std::map<int, std::string>, std::unordered_map<int, std::string>,
     absl::flat_hash_map<int, std::string>,
     absl::node_hash_map<int, std::string>, absl::btree_map<int, std::string>,
     UnorderedSequence<std::pair<const int, std::string>>>;
-INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueAssociativeMapTest,
+INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueAssociativeMapTest,
                               AssociativeMapTypes);
 
 template <typename T>
@@ -763,11 +763,11 @@ TYPED_TEST_P(HashValueAssociativeMultimapTest, BasicUsage) {
   EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars));
 }
 
-REGISTER_TYPED_TEST_CASE_P(HashValueAssociativeMultimapTest, BasicUsage);
+REGISTER_TYPED_TEST_SUITE_P(HashValueAssociativeMultimapTest, BasicUsage);
 using AssociativeMultimapTypes =
     testing::Types<std::multimap<int, std::string>,
                    std::unordered_multimap<int, std::string>>;
-INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueAssociativeMultimapTest,
+INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueAssociativeMultimapTest,
                               AssociativeMultimapTypes);
 
 TEST(HashValueTest, ReferenceWrapper) {
@@ -1007,10 +1007,10 @@ TYPED_TEST_P(HashIntTest, BasicUsage) {
             Hash<CombineVariadic<TypeParam>>()({}));
 }
 
-REGISTER_TYPED_TEST_CASE_P(HashIntTest, BasicUsage);
+REGISTER_TYPED_TEST_SUITE_P(HashIntTest, BasicUsage);
 using IntTypes = testing::Types<unsigned char, char, int, int32_t, int64_t,
                                 uint32_t, uint64_t, size_t>;
-INSTANTIATE_TYPED_TEST_CASE_P(My, HashIntTest, IntTypes);
+INSTANTIATE_TYPED_TEST_SUITE_P(My, HashIntTest, IntTypes);
 
 struct StructWithPadding {
   char c;
diff --git a/absl/strings/internal/str_format/checker.h b/absl/strings/internal/str_format/checker.h
index a0a13cec..4fd19d13 100644
--- a/absl/strings/internal/str_format/checker.h
+++ b/absl/strings/internal/str_format/checker.h
@@ -22,7 +22,6 @@
 // Compile time check support for entry points.
 
 #ifndef ABSL_INTERNAL_ENABLE_FORMAT_CHECKER
-
 // We disable format checker under vscode intellisense compilation.
 // See https://github.com/microsoft/vscode-cpptools/issues/3683 for
 // more details.
diff --git a/absl/strings/str_split.h b/absl/strings/str_split.h
index bfbca422..7bbb68a3 100644
--- a/absl/strings/str_split.h
+++ b/absl/strings/str_split.h
@@ -461,8 +461,7 @@ using EnableSplitIfString =
 // first two split strings become the `std::pair` `.first` and `.second`
 // members, respectively. The remaining split substrings are discarded. If there
 // are less than two split substrings, the empty string is used for the
-// corresponding
-// `std::pair` member.
+// corresponding `std::pair` member.
 //
 // Example:
 //