mirror of
https://github.com/chromium/crashpad.git
synced 2025-01-15 10:07:56 +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>
72 lines
2.1 KiB
C++
72 lines
2.1 KiB
C++
// Copyright 2017 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 <memory>
|
|
|
|
#include "base/macros.h"
|
|
#include "build/build_config.h"
|
|
#include "handler/handler_main.h"
|
|
#include "minidump/test/minidump_user_extension_stream_util.h"
|
|
#include "tools/tool_support.h"
|
|
|
|
#if defined(OS_WIN)
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
namespace {
|
|
|
|
class TestUserStreamDataSource : public crashpad::UserStreamDataSource {
|
|
public:
|
|
TestUserStreamDataSource() {}
|
|
|
|
std::unique_ptr<crashpad::MinidumpUserExtensionStreamDataSource>
|
|
ProduceStreamData(crashpad::ProcessSnapshot* process_snapshot) override;
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(TestUserStreamDataSource);
|
|
};
|
|
|
|
std::unique_ptr<crashpad::MinidumpUserExtensionStreamDataSource>
|
|
TestUserStreamDataSource::ProduceStreamData(
|
|
crashpad::ProcessSnapshot* process_snapshot) {
|
|
static constexpr char kTestData[] = "Injected extension stream!";
|
|
|
|
return std::make_unique<crashpad::test::BufferExtensionStreamDataSource>(
|
|
0xCAFEBABE, kTestData, sizeof(kTestData));
|
|
}
|
|
|
|
int ExtendedHandlerMain(int argc, char* argv[]) {
|
|
crashpad::UserStreamDataSources user_stream_data_sources;
|
|
user_stream_data_sources.push_back(
|
|
std::make_unique<TestUserStreamDataSource>());
|
|
|
|
return crashpad::HandlerMain(argc, argv, &user_stream_data_sources);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
#if defined(OS_MACOSX)
|
|
|
|
int main(int argc, char* argv[]) {
|
|
return ExtendedHandlerMain(argc, argv);
|
|
}
|
|
|
|
#elif defined(OS_WIN)
|
|
|
|
int wmain(int argc, wchar_t* argv[]) {
|
|
return crashpad::ToolSupport::Wmain(argc, argv, &ExtendedHandlerMain);
|
|
}
|
|
|
|
#endif // OS_MACOSX
|