Fix lint errors and clean up C++ to make syncing to google3 easier.

Change-Id: I8955ba39b478b8c45afdbdd3c738d741541c6d1e
ORIGINAL_AUTHOR=Thai Duong <thaidn@google.com>

GitOrigin-RevId: 6c5cd598937e64ca05fb28a889bb716fd6710b5c

cc/aead/aead_factory.h

@@ -78,7 +78,6 @@ class AeadFactory {
       const KeyManager<Aead>& custom_key_manager) {
     return util::Status::UNKNOWN;
   }
-
 };
 
 }  // namespace tink

cc/keyset_handle.h

@@ -17,8 +17,6 @@
 #ifndef TINK_KEYSET_HANDLE_H_
 #define TINK_KEYSET_HANDLE_H_
 
-#include "google/protobuf/stubs/statusor.h"
-#include "google/protobuf/stubs/stringpiece.h"
 #include "proto/tink.pb.h"
 
 namespace cloud {

cc/util/status.cc

@@ -19,7 +19,6 @@
 #include "cc/util/status.h"
 
 using ::std::ostream;
-using std::string;
 
 namespace util {
 
@@ -43,7 +42,7 @@ const Status& GetUnknown() {
 Status::Status() : code_(::util::error::OK), message_("") {
 }
 
-Status::Status(::util::error::Code error, const string& error_message)
+Status::Status(::util::error::Code error, const std::string& error_message)
     : code_(error), message_(error_message) {
   if (code_ == ::util::error::OK) {
     message_.clear();
@@ -64,7 +63,7 @@ const Status& Status::CANCELLED = GetCancelled();
 const Status& Status::UNKNOWN = GetUnknown();
 const Status& Status::OK = Status();
 
-string Status::ToString() const {
+std::string Status::ToString() const {
   if (code_ == ::util::error::OK) {
     return "OK";
   }
@@ -74,7 +73,7 @@ string Status::ToString() const {
   return oss.str();
 }
 
-string ErrorCodeString(util::error::Code error) {
+std::string ErrorCodeString(util::error::Code error) {
   switch (error) {
     case util::error::OK:
       return "OK";

java/src/main/java/com/google/cloud/crypto/tink/hybrid/BUILD

@@ -41,7 +41,6 @@ java_library(
         "//proto:java_hmac",
         "//proto:java_tink",
         "//proto:java_tink_compile_imports",
-        "@com_google_guava//jar",
     ],
 )
 
@@ -75,6 +74,5 @@ java_library(
         "//proto:java_hmac",
         "//proto:java_tink",
         "//proto:java_tink_compile_imports",
-        "@com_google_guava//jar",
     ],
 )

java/src/main/java/com/google/cloud/crypto/tink/subtle/BUILD

@@ -61,8 +61,6 @@ java_library(
         "@com_google_cloudkms//jar",
         "@com_google_guava//jar",
         "@com_google_http_client//jar",
-        "@com_google_http_client_jackson2//jar",
-        "@com_google_oauth_client//jar",
     ],
 )
 
@@ -139,7 +137,4 @@ java_library(
         "Curve25519.java",
     ],
     javacopts = JAVACOPTS,
-    deps = [
-        "@com_google_guava//jar",
-    ],
 )

tools/tinkey/src/main/java/com/google/cloud/crypto/tink/tinkey/EnvelopeCommand.java

@@ -59,4 +59,5 @@ public class EnvelopeCommand extends EnvelopeOptions implements Command {
         .rotate();
     return manager.getKeysetHandle().getKeyset();
   }
-}
+}
\ No newline at end of file
+