Automatically apply some clang-tidy fixes

PiperOrigin-RevId: 420688543

21 files changed, 54 insertions, 13 deletions

diff --git a/cc/core/binary_keyset_reader.cc b/cc/core/binary_keyset_reader.cc
index bbbbdbda2..2b98e907e 100644
--- a/cc/core/binary_keyset_reader.cc
+++ b/cc/core/binary_keyset_reader.cc
@@ -19,6 +19,7 @@
 #include <iostream>
 #include <istream>
 #include <sstream>
+#include <utility>
 
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
diff --git a/cc/core/binary_keyset_reader_test.cc b/cc/core/binary_keyset_reader_test.cc
index 1dab5c914..bd92d931f 100644
--- a/cc/core/binary_keyset_reader_test.cc
+++ b/cc/core/binary_keyset_reader_test.cc
@@ -19,9 +19,11 @@
 #include <iostream>
 #include <istream>
 #include <sstream>
+#include <string>
+#include <utility>
 
-#include "tink/util/test_util.h"
 #include "gtest/gtest.h"
+#include "tink/util/test_util.h"
 #include "proto/tink.pb.h"
 
 using crypto::tink::test::AddRawKey;
@@ -38,7 +40,7 @@ namespace {
 
 class BinaryKeysetReaderTest : public ::testing::Test {
  protected:
-  void SetUp() {
+  void SetUp() override {
     Keyset::Key key;
     AddTinkKey("some key type", 42, key, KeyStatusType::ENABLED,
                KeyData::SYMMETRIC, &keyset_);
diff --git a/cc/core/binary_keyset_writer.cc b/cc/core/binary_keyset_writer.cc
index 8b357c3d0..06e601df3 100644
--- a/cc/core/binary_keyset_writer.cc
+++ b/cc/core/binary_keyset_writer.cc
@@ -16,9 +16,11 @@
 
 #include "tink/binary_keyset_writer.h"
 
-#include <ostream>
 #include <istream>
+#include <ostream>
 #include <sstream>
+#include <string>
+#include <utility>
 
 #include "absl/status/status.h"
 #include "tink/util/errors.h"
diff --git a/cc/core/binary_keyset_writer_test.cc b/cc/core/binary_keyset_writer_test.cc
index d1f7d59a1..42f91bf62 100644
--- a/cc/core/binary_keyset_writer_test.cc
+++ b/cc/core/binary_keyset_writer_test.cc
@@ -18,9 +18,11 @@
 
 #include <ostream>
 #include <sstream>
+#include <string>
+#include <utility>
 
-#include "tink/util/test_util.h"
 #include "gtest/gtest.h"
+#include "tink/util/test_util.h"
 #include "proto/tink.pb.h"
 
 using crypto::tink::test::AddRawKey;
@@ -37,7 +39,7 @@ namespace {
 
 class BinaryKeysetWriterTest : public ::testing::Test {
  protected:
-  void SetUp() {
+  void SetUp() override {
     Keyset::Key key;
     AddTinkKey("some key type", 42, key, KeyStatusType::ENABLED,
                KeyData::SYMMETRIC, &keyset_);
diff --git a/cc/core/cleartext_keyset_handle.cc b/cc/core/cleartext_keyset_handle.cc
index de5ef8433..351f46ff4 100644
--- a/cc/core/cleartext_keyset_handle.cc
+++ b/cc/core/cleartext_keyset_handle.cc
@@ -17,6 +17,7 @@
 #include "tink/cleartext_keyset_handle.h"
 
 #include <istream>
+#include <utility>
 
 #include "absl/status/status.h"
 #include "tink/keyset_handle.h"
diff --git a/cc/core/cleartext_keyset_handle_test.cc b/cc/core/cleartext_keyset_handle_test.cc
index 643d719f1..ad7b27a7c 100644
--- a/cc/core/cleartext_keyset_handle_test.cc
+++ b/cc/core/cleartext_keyset_handle_test.cc
@@ -17,6 +17,7 @@
 #include "tink/cleartext_keyset_handle.h"
 
 #include <istream>
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "tink/binary_keyset_reader.h"
diff --git a/cc/core/config.cc b/cc/core/config.cc
index fd43a2527..f38659bfe 100644
--- a/cc/core/config.cc
+++ b/cc/core/config.cc
@@ -16,6 +16,8 @@
 
 #include "tink/config.h"
 
+#include <string>
+
 #include "absl/status/status.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_cat.h"
diff --git a/cc/core/crypto_format.cc b/cc/core/crypto_format.cc
index c24890a2a..04ec8abab 100644
--- a/cc/core/crypto_format.cc
+++ b/cc/core/crypto_format.cc
@@ -14,8 +14,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "absl/status/status.h"
 #include "tink/crypto_format.h"
+
+#include <string>
+
+#include "absl/status/status.h"
 #include "tink/util/errors.h"
 #include "tink/util/statusor.h"
 #include "proto/tink.pb.h"
diff --git a/cc/core/json_keyset_reader.cc b/cc/core/json_keyset_reader.cc
index f1a76a865..ddbee76c5 100644
--- a/cc/core/json_keyset_reader.cc
+++ b/cc/core/json_keyset_reader.cc
@@ -19,6 +19,8 @@
 #include <iostream>
 #include <istream>
 #include <sstream>
+#include <string>
+#include <utility>
 
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
@@ -33,7 +35,6 @@
 #include "tink/util/statusor.h"
 #include "proto/tink.pb.h"
 
-
 namespace crypto {
 namespace tink {
 
diff --git a/cc/core/json_keyset_reader_test.cc b/cc/core/json_keyset_reader_test.cc
index cf30c3d5e..fb79d5d8b 100644
--- a/cc/core/json_keyset_reader_test.cc
+++ b/cc/core/json_keyset_reader_test.cc
@@ -19,6 +19,8 @@
 #include <iostream>
 #include <istream>
 #include <sstream>
+#include <string>
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "absl/strings/escaping.h"
@@ -51,7 +53,7 @@ namespace {
 
 class JsonKeysetReaderTest : public ::testing::Test {
  protected:
-  void SetUp() {
+  void SetUp() override {
     gcm_key_.set_key_value("some gcm key value");
     gcm_key_.set_version(0);
 
diff --git a/cc/core/json_keyset_writer.cc b/cc/core/json_keyset_writer.cc
index 8f3e4747e..dbabd5e76 100644
--- a/cc/core/json_keyset_writer.cc
+++ b/cc/core/json_keyset_writer.cc
@@ -16,9 +16,11 @@
 
 #include "tink/json_keyset_writer.h"
 
-#include <ostream>
 #include <istream>
+#include <ostream>
 #include <sstream>
+#include <string>
+#include <utility>
 
 #include "absl/status/status.h"
 #include "absl/strings/escaping.h"
@@ -31,7 +33,6 @@
 #include "tink/util/statusor.h"
 #include "proto/tink.pb.h"
 
-
 namespace crypto {
 namespace tink {
 
diff --git a/cc/core/json_keyset_writer_test.cc b/cc/core/json_keyset_writer_test.cc
index 36471649f..d1b49076b 100644
--- a/cc/core/json_keyset_writer_test.cc
+++ b/cc/core/json_keyset_writer_test.cc
@@ -18,6 +18,8 @@
 
 #include <ostream>
 #include <sstream>
+#include <string>
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "absl/strings/escaping.h"
diff --git a/cc/core/key_manager_impl.h b/cc/core/key_manager_impl.h
index 7be743e32..bfc01da9f 100644
--- a/cc/core/key_manager_impl.h
+++ b/cc/core/key_manager_impl.h
@@ -16,6 +16,10 @@
 #ifndef TINK_CORE_KEY_MANAGER_IMPL_H_
 #define TINK_CORE_KEY_MANAGER_IMPL_H_
 
+#include <functional>
+#include <string>
+#include <utility>
+
 #include "absl/base/casts.h"
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
diff --git a/cc/core/key_type_manager.h b/cc/core/key_type_manager.h
index ff8760a32..8b9a9bd2f 100644
--- a/cc/core/key_type_manager.h
+++ b/cc/core/key_type_manager.h
@@ -17,6 +17,7 @@
 #ifndef TINK_CORE_KEY_TYPE_MANAGER_H_
 #define TINK_CORE_KEY_TYPE_MANAGER_H_
 
+#include <string>
 #include <tuple>
 
 #include "absl/status/status.h"
diff --git a/cc/core/keyset_manager.cc b/cc/core/keyset_manager.cc
index 9fa672021..30f99e114 100644
--- a/cc/core/keyset_manager.cc
+++ b/cc/core/keyset_manager.cc
@@ -17,6 +17,7 @@
 #include "tink/keyset_manager.h"
 
 #include <random>
+#include <utility>
 
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
diff --git a/cc/core/keyset_manager_test.cc b/cc/core/keyset_manager_test.cc
index 3b64cd752..696bdb426 100644
--- a/cc/core/keyset_manager_test.cc
+++ b/cc/core/keyset_manager_test.cc
@@ -15,6 +15,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 #include "tink/keyset_manager.h"
 
+#include <utility>
+
 #include "gtest/gtest.h"
 #include "tink/aead/aead_config.h"
 #include "tink/aead/aes_gcm_key_manager.h"
diff --git a/cc/core/kms_clients.cc b/cc/core/kms_clients.cc
index b80411bd4..fd74b4042 100644
--- a/cc/core/kms_clients.cc
+++ b/cc/core/kms_clients.cc
@@ -15,6 +15,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "tink/kms_clients.h"
 
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/cc/core/kms_clients_test.cc b/cc/core/kms_clients_test.cc
index 63eb6a6ad..398a30f33 100644
--- a/cc/core/kms_clients_test.cc
+++ b/cc/core/kms_clients_test.cc
@@ -14,16 +14,19 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+#include "tink/kms_clients.h"
+
+#include <string>
+
+#include "gtest/gtest.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "tink/aead.h"
-#include "tink/kms_clients.h"
 #include "tink/kms_client.h"
 #include "tink/util/status.h"
 #include "tink/util/statusor.h"
-#include "tink/util/test_util.h"
 #include "tink/util/test_matchers.h"
-#include "gtest/gtest.h"
+#include "tink/util/test_util.h"
 
 namespace crypto {
 namespace tink {
diff --git a/cc/core/primitive_set_test.cc b/cc/core/primitive_set_test.cc
index 90d191391..eaa7265dc 100644
--- a/cc/core/primitive_set_test.cc
+++ b/cc/core/primitive_set_test.cc
@@ -16,7 +16,9 @@
 
 #include "tink/primitive_set.h"
 
+#include <string>
 #include <thread>  // NOLINT(build/c++11)
+#include <utility>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/cc/core/private_key_manager_impl.h b/cc/core/private_key_manager_impl.h
index 3bf159885..d85577795 100644
--- a/cc/core/private_key_manager_impl.h
+++ b/cc/core/private_key_manager_impl.h
@@ -16,6 +16,9 @@
 #ifndef TINK_CORE_PRIVATE_KEY_MANAGER_IMPL_H_
 #define TINK_CORE_PRIVATE_KEY_MANAGER_IMPL_H_
 
+#include <string>
+#include <utility>
+
 #include "absl/status/status.h"
 #include "tink/core/key_manager_impl.h"
 #include "tink/core/private_key_type_manager.h"
diff --git a/cc/core/version_test.cc b/cc/core/version_test.cc
index e47a9b99d..d25babd75 100644
--- a/cc/core/version_test.cc
+++ b/cc/core/version_test.cc
@@ -15,6 +15,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "tink/version.h"
+
+#include <string>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"