
Automated patch. This is a no-op. Please avoid, as much as possible, assigning unrelated bugs to this. Context: https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email As of https://crrev.com/1204351, absl::optional is now a type alias for std::optional. We should migrate toward it. Script: ``` function replace { echo "Replacing $1 by $2" git grep -l "$1" \ | cut -f1 -d: \ | grep -v \ -e "components/cast_streaming/browser/public/receiver_config.*" \ -e "components/power_metrics/*" \ -e "components/zucchini/patch_reader.*" \ -e "third_party/abseil-cpp/*" \ -e "third_party/googletest/*" \ -e "third_party/leveldatabase/*" \ -e "third_party/libaddressinput/" \ -e "third_party/liburlpattern/*" \ -e "third_party/lzma_sdk/*" \ -e "third_party/maldoca/*" \ -e "third_party/mediapipe/*" \ -e "third_party/shell-encryption/*"\ -e "third_party/tflite_support/*" \ -e "third_party/webrtc_overrides/*" \ -e "third_party/zxcvbn-cpp/*" \ | grep \ -e "\.h" \ -e "\.cc" \ -e "\.mm" \ -e "\.pidl" \ | sort \ | uniq \ | xargs sed -i "s/$1/$2/g" } replace "absl::make_optional" "std::make_optional" replace "absl::optional" "std::optional" replace "absl::nullopt" "std::nullopt" replace "absl::in_place," "std::in_place," replace "absl::in_place_t," "std::in_place_t," replace "absl::in_place)" "std::in_place)" replace "absl::in_place_t)" "std::in_place_t)" replace "\"third_party\/abseil-cpp\/absl\/types\/optional.h\"" "<optional>" git status echo "Formatting" echo "IncludeBlocks: Regroup" >> ".clang-format" echo "IncludeIsMainRegex: \"(_(android|apple|chromeos|freebsd|fuchsia|fuzzer|ios|linux|mac|nacl|openbsd|posix|stubs?|win))?(_(unit|browser|perf)?tests?)?$\"" >> ".clang-format" git cl format git restore ".clang-format" ``` Bug: chromium:1500249 Change-Id: Ic2994b982bbc64d62f030d3d158979dc5d266121 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5296147 Reviewed-by: danakj <danakj@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Owners-Override: danakj <danakj@chromium.org> Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org> Cr-Commit-Position: refs/heads/main@{#1263362}
155 lines
4.9 KiB
C++
155 lines
4.9 KiB
C++
// Copyright 2014 The Chromium Authors
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "base/supports_user_data.h"
|
|
|
|
#include "base/features.h"
|
|
#include "base/memory/ptr_util.h"
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/memory/raw_ref.h"
|
|
#include "base/test/gtest_util.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
|
|
namespace base {
|
|
namespace {
|
|
|
|
struct TestSupportsUserData : public SupportsUserData {
|
|
// Make ClearAllUserData public so tests can access it.
|
|
using SupportsUserData::ClearAllUserData;
|
|
};
|
|
|
|
struct UsesItself : public SupportsUserData::Data {
|
|
UsesItself(SupportsUserData* supports_user_data, const void* key)
|
|
: supports_user_data_(supports_user_data),
|
|
key_(key) {
|
|
}
|
|
|
|
~UsesItself() override {
|
|
EXPECT_EQ(nullptr, supports_user_data_->GetUserData(key_));
|
|
}
|
|
|
|
raw_ptr<SupportsUserData> supports_user_data_;
|
|
raw_ptr<const void> key_;
|
|
};
|
|
|
|
using SupportsUserDataTest = ::testing::Test;
|
|
|
|
TEST_F(SupportsUserDataTest, ClearWorksRecursively) {
|
|
char key = 0; // Must outlive `supports_user_data`.
|
|
TestSupportsUserData supports_user_data;
|
|
supports_user_data.SetUserData(
|
|
&key, std::make_unique<UsesItself>(&supports_user_data, &key));
|
|
// Destruction of supports_user_data runs the actual test.
|
|
}
|
|
|
|
struct TestData : public SupportsUserData::Data {};
|
|
|
|
TEST_F(SupportsUserDataTest, Movable) {
|
|
TestSupportsUserData supports_user_data_1;
|
|
char key1 = 0;
|
|
supports_user_data_1.SetUserData(&key1, std::make_unique<TestData>());
|
|
void* data_1_ptr = supports_user_data_1.GetUserData(&key1);
|
|
|
|
TestSupportsUserData supports_user_data_2;
|
|
char key2 = 0;
|
|
supports_user_data_2.SetUserData(&key2, std::make_unique<TestData>());
|
|
|
|
supports_user_data_2 = std::move(supports_user_data_1);
|
|
|
|
EXPECT_EQ(data_1_ptr, supports_user_data_2.GetUserData(&key1));
|
|
EXPECT_EQ(nullptr, supports_user_data_2.GetUserData(&key2));
|
|
}
|
|
|
|
TEST_F(SupportsUserDataTest, ClearAllUserData) {
|
|
TestSupportsUserData supports_user_data;
|
|
char key1 = 0;
|
|
supports_user_data.SetUserData(&key1, std::make_unique<TestData>());
|
|
char key2 = 0;
|
|
supports_user_data.SetUserData(&key2, std::make_unique<TestData>());
|
|
|
|
EXPECT_TRUE(supports_user_data.GetUserData(&key1));
|
|
EXPECT_TRUE(supports_user_data.GetUserData(&key2));
|
|
|
|
supports_user_data.ClearAllUserData();
|
|
|
|
EXPECT_FALSE(supports_user_data.GetUserData(&key1));
|
|
EXPECT_FALSE(supports_user_data.GetUserData(&key2));
|
|
}
|
|
|
|
TEST_F(SupportsUserDataTest, TakeUserData) {
|
|
TestSupportsUserData supports_user_data;
|
|
char key1 = 0;
|
|
supports_user_data.SetUserData(&key1, std::make_unique<TestData>());
|
|
|
|
TestSupportsUserData::Data* data1_ptr = supports_user_data.GetUserData(&key1);
|
|
EXPECT_NE(data1_ptr, nullptr);
|
|
|
|
char wrong_key = 0;
|
|
EXPECT_FALSE(supports_user_data.TakeUserData(&wrong_key));
|
|
|
|
EXPECT_EQ(supports_user_data.GetUserData(&key1), data1_ptr);
|
|
|
|
std::unique_ptr<TestSupportsUserData::Data> data1 =
|
|
supports_user_data.TakeUserData(&key1);
|
|
EXPECT_EQ(data1.get(), data1_ptr);
|
|
|
|
EXPECT_FALSE(supports_user_data.GetUserData(&key1));
|
|
EXPECT_FALSE(supports_user_data.TakeUserData(&key1));
|
|
}
|
|
|
|
class DataOwnsSupportsUserData : public SupportsUserData::Data {
|
|
public:
|
|
TestSupportsUserData* supports_user_data() { return &supports_user_data_; }
|
|
|
|
private:
|
|
TestSupportsUserData supports_user_data_;
|
|
};
|
|
|
|
// Tests that removing a `SupportsUserData::Data` that owns a `SupportsUserData`
|
|
// does not crash.
|
|
TEST_F(SupportsUserDataTest, ReentrantRemoveUserData) {
|
|
DataOwnsSupportsUserData* data = new DataOwnsSupportsUserData;
|
|
char key = 0;
|
|
data->supports_user_data()->SetUserData(&key, WrapUnique(data));
|
|
data->supports_user_data()->RemoveUserData(&key);
|
|
}
|
|
|
|
TEST_F(SupportsUserDataTest, ReentrantSetUserDataDuringRemoval) {
|
|
static const char kKey = 0;
|
|
|
|
class ProblematicSet : public SupportsUserData::Data {
|
|
public:
|
|
explicit ProblematicSet(const void* const key,
|
|
TestSupportsUserData& supports_user_data)
|
|
: key_(key), supports_user_data_(supports_user_data) {}
|
|
|
|
~ProblematicSet() override {
|
|
supports_user_data_->SetUserData(
|
|
key_, std::make_unique<ProblematicSet>(key_, *supports_user_data_));
|
|
}
|
|
|
|
private:
|
|
const raw_ptr<const void> key_;
|
|
raw_ref<TestSupportsUserData> supports_user_data_;
|
|
};
|
|
{
|
|
std::optional<TestSupportsUserData> supports_user_data;
|
|
supports_user_data.emplace();
|
|
// This awkward construction is required since death tests are typically
|
|
// implemented using `fork()`, so calling `SetUserData()` outside the
|
|
// `EXPECT_CHECK_DEATH()` macro will also crash the process that's trying to
|
|
// observe the crash.
|
|
EXPECT_CHECK_DEATH([&] {
|
|
supports_user_data->SetUserData(
|
|
&kKey, std::make_unique<ProblematicSet>(&kKey, *supports_user_data));
|
|
// Triggers the reentrant attempt to call `SetUserData()` during
|
|
// destruction.
|
|
supports_user_data.reset();
|
|
}());
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace base
|