mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-26 23:01:05 +08:00
7a849482ea
Update mini_chromium to 7d6697ceb5cb5ca02fde3813496f48b9b1d76d0c
47ff9691450e Switch the language standard to C++14
7d6697ceb5cb Remove base/memory/ptr_util.h and base::WrapUnique
base::WrapUnique and std::make_unique are similar, but the latter is
standardized and preferred.
Most of the mechanical changes were made with this sed:
for f in $(git grep -l base::WrapUnique | uniq); do
sed -E \
-e 's%base::WrapUnique\(new ([^(]+)\((.*)\)\);%std::make_unique<\1>(\2);%g' \
-e 's%base::WrapUnique\(new ([^(]+)\);%std::make_unique<\1>();%g' \
-e 's%^#include "base/memory/ptr_util.h"$%#include <memory>%' \
-i '' "${f}"
done
Several uses of base::WrapUnique that did not fit on a single line and
were not matched by this sed were adjusted manually. All #include
changes were audited manually, to at least move <memory> into the
correct section. Where <memory> was already #included by a file (or its
corresponding header), the extra #include was removed. Where <memory>
should have been #included by a header, it was added. Other similar
adjustments to other #includes were also made.
Change-Id: Id4e0baad8b3652646bede4c3f30f41fcabfdbd4f
Reviewed-on: https://chromium-review.googlesource.com/714658
Commit-Queue: Mark Mentovai <mark@chromium.org>
Reviewed-by: Leonard Mosescu <mosescu@chromium.org>
105 lines
3.0 KiB
C++
105 lines
3.0 KiB
C++
// Copyright 2014 The Crashpad Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "minidump/minidump_rva_list_writer.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/format_macros.h"
|
|
#include "base/strings/stringprintf.h"
|
|
#include "gtest/gtest.h"
|
|
#include "minidump/test/minidump_rva_list_test_util.h"
|
|
#include "minidump/test/minidump_writable_test_util.h"
|
|
#include "util/file/string_file.h"
|
|
|
|
namespace crashpad {
|
|
namespace test {
|
|
namespace {
|
|
|
|
class TestMinidumpRVAListWriter final : public internal::MinidumpRVAListWriter {
|
|
public:
|
|
TestMinidumpRVAListWriter() : MinidumpRVAListWriter() {}
|
|
~TestMinidumpRVAListWriter() override {}
|
|
|
|
void AddChild(uint32_t value) {
|
|
auto child = std::make_unique<TestUInt32MinidumpWritable>(value);
|
|
MinidumpRVAListWriter::AddChild(std::move(child));
|
|
}
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(TestMinidumpRVAListWriter);
|
|
};
|
|
|
|
TEST(MinidumpRVAListWriter, Empty) {
|
|
TestMinidumpRVAListWriter list_writer;
|
|
|
|
StringFile string_file;
|
|
|
|
ASSERT_TRUE(list_writer.WriteEverything(&string_file));
|
|
EXPECT_EQ(string_file.string().size(), sizeof(MinidumpRVAList));
|
|
|
|
const MinidumpRVAList* list = MinidumpRVAListAtStart(string_file.string(), 0);
|
|
ASSERT_TRUE(list);
|
|
}
|
|
|
|
TEST(MinidumpRVAListWriter, OneChild) {
|
|
TestMinidumpRVAListWriter list_writer;
|
|
|
|
constexpr uint32_t kValue = 0;
|
|
list_writer.AddChild(kValue);
|
|
|
|
StringFile string_file;
|
|
|
|
ASSERT_TRUE(list_writer.WriteEverything(&string_file));
|
|
|
|
const MinidumpRVAList* list = MinidumpRVAListAtStart(string_file.string(), 1);
|
|
ASSERT_TRUE(list);
|
|
|
|
const uint32_t* child = MinidumpWritableAtRVA<uint32_t>(
|
|
string_file.string(), list->children[0]);
|
|
ASSERT_TRUE(child);
|
|
EXPECT_EQ(*child, kValue);
|
|
}
|
|
|
|
TEST(MinidumpRVAListWriter, ThreeChildren) {
|
|
TestMinidumpRVAListWriter list_writer;
|
|
|
|
static constexpr uint32_t kValues[] = {0x80000000, 0x55555555, 0x66006600};
|
|
|
|
list_writer.AddChild(kValues[0]);
|
|
list_writer.AddChild(kValues[1]);
|
|
list_writer.AddChild(kValues[2]);
|
|
|
|
StringFile string_file;
|
|
|
|
ASSERT_TRUE(list_writer.WriteEverything(&string_file));
|
|
|
|
const MinidumpRVAList* list =
|
|
MinidumpRVAListAtStart(string_file.string(), arraysize(kValues));
|
|
ASSERT_TRUE(list);
|
|
|
|
for (size_t index = 0; index < arraysize(kValues); ++index) {
|
|
SCOPED_TRACE(base::StringPrintf("index %" PRIuS, index));
|
|
|
|
const uint32_t* child = MinidumpWritableAtRVA<uint32_t>(
|
|
string_file.string(), list->children[index]);
|
|
ASSERT_TRUE(child);
|
|
EXPECT_EQ(*child, kValues[index]);
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace test
|
|
} // namespace crashpad
|