Move util to crypto::tink::util.

Change-Id: I2e628298c31e26da0067196634b5dc4d3bd5ed84
ORIGINAL_AUTHOR=Thai Duong <thaidn@google.com>
GitOrigin-RevId: 9b88cb7f7aad68ff16094ab7ff6a3a1620f58cd5

1 files changed, 4 insertions, 4 deletions

diff --git a/cc/primitive_set.h b/cc/primitive_set.h
index b74a79adf..2af24b453 100644
--- a/cc/primitive_set.h
+++ b/cc/primitive_set.h
@@ -83,7 +83,7 @@ class PrimitiveSet {
   PrimitiveSet<P>() : primary_(nullptr) {}
 
   // Adds 'primitive' to this set for the specified 'key'.
-  util::StatusOr<Entry<P>*> AddPrimitive(
+  crypto::tink::util::StatusOr<Entry<P>*> AddPrimitive(
       std::unique_ptr<P> primitive,
       google::crypto::tink::Keyset::Key key) {
     auto identifier_result = CryptoFormat::get_output_prefix(key);
@@ -96,13 +96,13 @@ class PrimitiveSet {
   }
 
   // Returns the entries with primitives identifed by 'identifier'.
-  util::StatusOr<const Primitives*> get_primitives(
+  crypto::tink::util::StatusOr<const Primitives*> get_primitives(
       google::protobuf::StringPiece identifier) {
     std::lock_guard<std::mutex> lock(primitives_mutex_);
     typename CiphertextPrefixToPrimitivesMap::iterator found =
         primitives_.find(identifier.ToString());
     if (found == primitives_.end()) {
-      return ToStatusF(util::error::NOT_FOUND,
+      return ToStatusF(crypto::tink::util::error::NOT_FOUND,
                        "No primitives found for identifier '%s'.",
                        identifier.ToString().c_str());
     }
@@ -110,7 +110,7 @@ class PrimitiveSet {
   }
 
   // Returns all primitives that use RAW prefix.
-  util::StatusOr<const Primitives*> get_raw_primitives() {
+  crypto::tink::util::StatusOr<const Primitives*> get_raw_primitives() {
     return get_primitives(CryptoFormat::kRawPrefix);
   }