Replace spdy_macros.h with direct use of Abseil.
PiperOrigin-RevId: 356244917
Change-Id: Ie5111111eb60b2fcda276d04908bc646d826f250
diff --git a/spdy/core/hpack/hpack_header_table.h b/spdy/core/hpack/hpack_header_table.h
index 3e921b8..02a438c 100644
--- a/spdy/core/hpack/hpack_header_table.h
+++ b/spdy/core/hpack/hpack_header_table.h
@@ -10,12 +10,12 @@
#include <deque>
#include <memory>
+#include "absl/base/attributes.h"
#include "absl/hash/hash.h"
#include "absl/strings/string_view.h"
#include "common/platform/api/quiche_export.h"
#include "spdy/core/hpack/hpack_entry.h"
#include "spdy/platform/api/spdy_containers.h"
-#include "spdy/platform/api/spdy_macros.h"
// All section references below are to http://tools.ietf.org/html/rfc7541.
@@ -122,7 +122,7 @@
const HpackEntry* TryAddEntry(absl::string_view name,
absl::string_view value);
- void DebugLogTableState() const SPDY_UNUSED;
+ void DebugLogTableState() const ABSL_ATTRIBUTE_UNUSED;
void set_debug_visitor(std::unique_ptr<DebugVisitorInterface> visitor) {
debug_visitor_ = std::move(visitor);
diff --git a/spdy/core/priority_write_scheduler.h b/spdy/core/priority_write_scheduler.h
index 214b267b..c6824c6 100644
--- a/spdy/core/priority_write_scheduler.h
+++ b/spdy/core/priority_write_scheduler.h
@@ -20,7 +20,6 @@
#include "spdy/core/write_scheduler.h"
#include "spdy/platform/api/spdy_bug_tracker.h"
#include "spdy/platform/api/spdy_logging.h"
-#include "spdy/platform/api/spdy_macros.h"
namespace spdy {
diff --git a/spdy/core/spdy_header_block.h b/spdy/core/spdy_header_block.h
index 123f506..76ec436 100644
--- a/spdy/core/spdy_header_block.h
+++ b/spdy/core/spdy_header_block.h
@@ -13,12 +13,12 @@
#include <utility>
#include <vector>
+#include "absl/base/attributes.h"
#include "absl/strings/string_view.h"
#include "common/platform/api/quiche_export.h"
#include "common/platform/api/quiche_logging.h"
#include "spdy/core/spdy_header_storage.h"
#include "spdy/platform/api/spdy_containers.h"
-#include "spdy/platform/api/spdy_macros.h"
#include "spdy/platform/api/spdy_string_utils.h"
namespace spdy {
@@ -244,7 +244,7 @@
};
// Allows either lookup or mutation of the value associated with a key.
- SPDY_MUST_USE_RESULT ValueProxy operator[](const absl::string_view key);
+ ABSL_MUST_USE_RESULT ValueProxy operator[](const absl::string_view key);
// Returns the estimate of dynamically allocated memory in bytes.
size_t EstimateMemoryUsage() const;
diff --git a/spdy/platform/api/spdy_macros.h b/spdy/platform/api/spdy_macros.h
deleted file mode 100644
index 58ea4d3..0000000
--- a/spdy/platform/api/spdy_macros.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2019 The Chromium 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 QUICHE_SPDY_PLATFORM_API_SPDY_MACROS_H_
-#define QUICHE_SPDY_PLATFORM_API_SPDY_MACROS_H_
-
-#include "net/spdy/platform/impl/spdy_macros_impl.h"
-
-#define SPDY_MUST_USE_RESULT SPDY_MUST_USE_RESULT_IMPL
-#define SPDY_UNUSED SPDY_UNUSED_IMPL
-
-#endif // QUICHE_SPDY_PLATFORM_API_SPDY_MACROS_H_
