[gtest] Fix all includes to use full path
Delete src/gtest.h
Change-Id: I8bfd94e4b4621f54978b24087e020ad2b3d68fed
diff --git a/src/bin/test_app/test_app_test.cc b/src/bin/test_app/test_app_test.cc
index c13d25c..b262fad 100644
--- a/src/bin/test_app/test_app_test.cc
+++ b/src/bin/test_app/test_app_test.cc
@@ -13,12 +13,12 @@
#include "gflags/gflags.h"
#include "src/bin/test_app/test_registry/test_registry.cb.h"
-#include "src/gtest.h"
#include "src/lib/crypto_util/base64.h"
#include "src/logger/logger_test_utils.h"
#include "src/logger/project_context.h"
#include "src/logger/project_context_factory.h"
#include "src/logging.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt {
diff --git a/src/gtest.h b/src/gtest.h
deleted file mode 100644
index f178295..0000000
--- a/src/gtest.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2017 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef COBALT_SRC_GTEST_H_
-#define COBALT_SRC_GTEST_H_
-
-#include "third_party/googletest/googletest/include/gtest/gtest.h"
-
-#endif // COBALT_SRC_GTEST_H_
diff --git a/src/lib/crypto_util/cipher_test.cc b/src/lib/crypto_util/cipher_test.cc
index 09c2556..a9830eb 100644
--- a/src/lib/crypto_util/cipher_test.cc
+++ b/src/lib/crypto_util/cipher_test.cc
@@ -19,7 +19,6 @@
#include <string>
#include <vector>
-#include <gtest/gtest.h>
#include <openssl/bn.h>
#include <openssl/ec.h>
#include <openssl/evp.h>
@@ -27,6 +26,7 @@
#include "src/lib/crypto_util/errors.h"
#include "src/lib/crypto_util/random.h"
#include "src/lib/crypto_util/types.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::crypto {
diff --git a/src/lib/util/consistent_proto_store_test.cc b/src/lib/util/consistent_proto_store_test.cc
index 21bbfec..7fc7e5e 100644
--- a/src/lib/util/consistent_proto_store_test.cc
+++ b/src/lib/util/consistent_proto_store_test.cc
@@ -6,9 +6,9 @@
#include <fstream>
-#include "src/gtest.h"
#include "src/lib/util/consistent_proto_store_test.pb.h"
#include "src/lib/util/posix_file_system.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::util {
diff --git a/src/logger/encoder_test.cc b/src/logger/encoder_test.cc
index db93877..5b207d8 100644
--- a/src/logger/encoder_test.cc
+++ b/src/logger/encoder_test.cc
@@ -9,7 +9,6 @@
#include <utility>
#include <vector>
-#include "src/gtest.h"
#include "src/lib/crypto_util/base64.h"
#include "src/logger/project_context.h"
#include "src/logger/project_context_factory.h"
@@ -20,6 +19,7 @@
#include "src/pb/observation2.pb.h"
#include "src/registry/packed_event_codes.h"
#include "src/system_data/fake_system_data.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt {
diff --git a/src/logger/event_aggregator_test.cc b/src/logger/event_aggregator_test.cc
index 3158866..486fa43 100644
--- a/src/logger/event_aggregator_test.cc
+++ b/src/logger/event_aggregator_test.cc
@@ -14,7 +14,6 @@
#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include "src/gtest.h"
#include "src/lib/util/clock.h"
#include "src/lib/util/datetime_util.h"
#include "src/lib/util/proto_util.h"
@@ -23,6 +22,7 @@
#include "src/pb/event.pb.h"
#include "src/registry/packed_event_codes.h"
#include "src/registry/project_configs.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt {
diff --git a/src/logger/event_loggers_test.cc b/src/logger/event_loggers_test.cc
index f855ca3..0289565 100644
--- a/src/logger/event_loggers_test.cc
+++ b/src/logger/event_loggers_test.cc
@@ -13,7 +13,6 @@
#include <google/protobuf/util/message_differencer.h>
#include "src/algorithms/rappor/rappor_encoder.h"
-#include "src/gtest.h"
#include "src/lib/util/clock.h"
#include "src/lib/util/datetime_util.h"
#include "src/lib/util/encrypted_message_util.h"
@@ -28,6 +27,7 @@
#include "src/registry/encodings.pb.h"
#include "src/registry/packed_event_codes.h"
#include "src/system_data/client_secret.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
using ::google::protobuf::RepeatedField;
#ifndef PROTO_LITE
diff --git a/src/logger/fake_logger.h b/src/logger/fake_logger.h
index c48cc8b..32d2070 100644
--- a/src/logger/fake_logger.h
+++ b/src/logger/fake_logger.h
@@ -13,7 +13,6 @@
#include <utility>
#include <vector>
-#include "src/gtest.h"
#include "src/lib/util/consistent_proto_store.h"
#include "src/lib/util/posix_file_system.h"
#include "src/lib/util/status.h"
@@ -21,6 +20,7 @@
#include "src/logger/logger_interface.h"
#include "src/logger/project_context.h"
#include "src/registry/project_configs.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt {
namespace logger {
diff --git a/src/logger/internal_metrics_test.cc b/src/logger/internal_metrics_test.cc
index 538ba59..504cd92 100644
--- a/src/logger/internal_metrics_test.cc
+++ b/src/logger/internal_metrics_test.cc
@@ -6,8 +6,8 @@
#include <vector>
-#include "src/gtest.h"
#include "src/logger/fake_logger.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::logger {
diff --git a/src/logger/logger_test.cc b/src/logger/logger_test.cc
index 8672ff7..ac321ed 100644
--- a/src/logger/logger_test.cc
+++ b/src/logger/logger_test.cc
@@ -11,7 +11,6 @@
#include <google/protobuf/util/message_differencer.h>
#include "src/algorithms/rappor/rappor_encoder.h"
-#include "src/gtest.h"
#include "src/lib/util/clock.h"
#include "src/lib/util/datetime_util.h"
#include "src/lib/util/encrypted_message_util.h"
@@ -27,6 +26,7 @@
#include "src/registry/encodings.pb.h"
#include "src/registry/packed_event_codes.h"
#include "src/system_data/client_secret.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
#ifndef PROTO_LITE
using ::google::protobuf::util::MessageDifferencer;
diff --git a/src/logger/logger_test_utils.h b/src/logger/logger_test_utils.h
index a4c5e1d..c04dc0b 100644
--- a/src/logger/logger_test_utils.h
+++ b/src/logger/logger_test_utils.h
@@ -13,7 +13,6 @@
#include <utility>
#include <vector>
-#include "src/gtest.h"
#include "src/lib/util/consistent_proto_store.h"
#include "src/lib/util/posix_file_system.h"
#include "src/lib/util/status.h"
@@ -24,6 +23,7 @@
#include "src/observation_store/observation_store.h"
#include "src/observation_store/observation_store_update_recipient.h"
#include "src/registry/project_configs.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt {
namespace logger {
diff --git a/src/logger/project_context_factory_test.cc b/src/logger/project_context_factory_test.cc
index 535ab95..6e842cc 100644
--- a/src/logger/project_context_factory_test.cc
+++ b/src/logger/project_context_factory_test.cc
@@ -9,12 +9,12 @@
#include <google/protobuf/text_format.h>
-#include "src/gtest.h"
#include "src/lib/crypto_util/base64.h"
#include "src/logger/test_registries/project_context_factory_test_registry/a.cb.h"
#include "src/logger/test_registries/project_context_factory_test_registry/b.cb.h"
#include "src/logger/test_registries/project_context_factory_test_registry/c.cb.h"
#include "src/logging.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::logger {
diff --git a/src/logger/project_context_test.cc b/src/logger/project_context_test.cc
index 574f85b..332b68b 100644
--- a/src/logger/project_context_test.cc
+++ b/src/logger/project_context_test.cc
@@ -11,12 +11,12 @@
#include <google/protobuf/text_format.h>
-#include "src/gtest.h"
#include "src/lib/crypto_util/base64.h"
#include "src/logger/test_registries/project_context_test_registry.cb.h"
#include "src/logging.h"
#include "src/pb/observation2.pb.h"
#include "src/registry/project_configs.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
using cobalt::config::ProjectConfigs;
diff --git a/src/observation_store/envelope_maker_test.cc b/src/observation_store/envelope_maker_test.cc
index 7b5b86a..ee328d1 100644
--- a/src/observation_store/envelope_maker_test.cc
+++ b/src/observation_store/envelope_maker_test.cc
@@ -6,9 +6,9 @@
#include <utility>
-#include "src/gtest.h"
#include "src/logging.h"
#include "third_party/gflags/include/gflags/gflags.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::observation_store {
diff --git a/src/observation_store/file_observation_store_test.cc b/src/observation_store/file_observation_store_test.cc
index d320a42..f0237c3 100644
--- a/src/observation_store/file_observation_store_test.cc
+++ b/src/observation_store/file_observation_store_test.cc
@@ -7,11 +7,11 @@
#include <random>
#include <utility>
-#include "src/gtest.h"
#include "src/lib/util/posix_file_system.h"
#include "src/logging.h"
#include "src/system_data/client_secret.h"
#include "third_party/googletest/googlemock/include/gmock/gmock.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::observation_store {
diff --git a/src/system_data/client_secret_test.cc b/src/system_data/client_secret_test.cc
index c5f24e4..d1d7d93 100644
--- a/src/system_data/client_secret_test.cc
+++ b/src/system_data/client_secret_test.cc
@@ -17,7 +17,7 @@
#include <string>
#include <utility>
-#include "src/gtest.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::encoder {
diff --git a/src/system_data/system_data_test.cc b/src/system_data/system_data_test.cc
index b8e6c3e..3ed0353 100644
--- a/src/system_data/system_data_test.cc
+++ b/src/system_data/system_data_test.cc
@@ -10,8 +10,8 @@
#include <string>
#include <utility>
-#include "src/gtest.h"
#include "src/logging.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::encoder {
diff --git a/src/uploader/shipping_manager_test.cc b/src/uploader/shipping_manager_test.cc
index a871a34..8e24f9a 100644
--- a/src/uploader/shipping_manager_test.cc
+++ b/src/uploader/shipping_manager_test.cc
@@ -11,7 +11,6 @@
#include <utility>
#include <vector>
-#include "src/gtest.h"
#include "src/logging.h"
#include "src/observation_store/memory_observation_store.h"
#include "src/observation_store/observation_store.h"
@@ -19,6 +18,7 @@
#include "src/system_data/fake_system_data.h"
#include "third_party/clearcut/clearcut.pb.h"
#include "third_party/gflags/include/gflags/gflags.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::encoder {
diff --git a/src/uploader/upload_scheduler_test.cc b/src/uploader/upload_scheduler_test.cc
index 62658c4..27cd3a2 100644
--- a/src/uploader/upload_scheduler_test.cc
+++ b/src/uploader/upload_scheduler_test.cc
@@ -4,7 +4,7 @@
#include "src/uploader/upload_scheduler.h"
-#include "src/gtest.h"
+#include "third_party/googletest/googletest/include/gtest/gtest.h"
namespace cobalt::encoder {
