Replace QuicheWrapUnique with absl::WrapUnique. PiperOrigin-RevId: 338087012 Change-Id: I1a03bc4c6c5c0866bbce01ef34511f3292ad84c9
diff --git a/common/platform/api/quiche_ptr_util.h b/common/platform/api/quiche_ptr_util.h deleted file mode 100644 index a59a595..0000000 --- a/common/platform/api/quiche_ptr_util.h +++ /dev/null
@@ -1,24 +0,0 @@ -// Copyright 2017 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_COMMON_PLATFORM_API_QUICHE_PTR_UTIL_H_ -#define QUICHE_COMMON_PLATFORM_API_QUICHE_PTR_UTIL_H_ - -#include <memory> - -#include "absl/memory/memory.h" -#include "net/quiche/common/platform/impl/quiche_ptr_util_impl.h" - -namespace quiche { - -template <typename T> -std::unique_ptr<T> QuicheWrapUnique(T* ptr) { - // TODO(b/166325009): replace this in code with absl::WrapUnique and delete - // this function. - return absl::WrapUnique<T>(ptr); -} - -} // namespace quiche - -#endif // QUICHE_COMMON_PLATFORM_API_QUICHE_PTR_UTIL_H_
diff --git a/spdy/core/spdy_framer.cc b/spdy/core/spdy_framer.cc index 58ce2b9..e5619df 100644 --- a/spdy/core/spdy_framer.cc +++ b/spdy/core/spdy_framer.cc
@@ -11,8 +11,8 @@ #include <new> #include <utility> +#include "absl/memory/memory.h" #include "net/third_party/quiche/src/http2/platform/api/http2_macros.h" -#include "net/third_party/quiche/src/common/platform/api/quiche_ptr_util.h" #include "net/third_party/quiche/src/spdy/core/spdy_bitmasks.h" #include "net/third_party/quiche/src/spdy/core/spdy_frame_builder.h" #include "net/third_party/quiche/src/spdy/core/spdy_frame_reader.h" @@ -413,12 +413,12 @@ switch (frame_ir->frame_type()) { case SpdyFrameType::HEADERS: { return std::make_unique<SpdyHeaderFrameIterator>( - framer, quiche::QuicheWrapUnique( + framer, absl::WrapUnique( static_cast<const SpdyHeadersIR*>(frame_ir.release()))); } case SpdyFrameType::PUSH_PROMISE: { return std::make_unique<SpdyPushPromiseFrameIterator>( - framer, quiche::QuicheWrapUnique( + framer, absl::WrapUnique( static_cast<const SpdyPushPromiseIR*>(frame_ir.release()))); } case SpdyFrameType::DATA: {