mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-29 00:32:35 +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>
82 lines
2.5 KiB
C++
82 lines
2.5 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.
|
|
|
|
#ifndef CRASHPAD_TEST_WIN_WIN_MULTIPROCESS_WITH_TEMPDIR_H_
|
|
#define CRASHPAD_TEST_WIN_WIN_MULTIPROCESS_WITH_TEMPDIR_H_
|
|
|
|
#include <wchar.h>
|
|
#include <windows.h>
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "base/files/file_path.h"
|
|
#include "base/macros.h"
|
|
#include "test/scoped_temp_dir.h"
|
|
#include "test/win/win_multiprocess.h"
|
|
|
|
namespace crashpad {
|
|
namespace test {
|
|
|
|
//! \brief Manages a multiprocess test on Windows with a parent-created
|
|
//! temporary directory.
|
|
//!
|
|
//! This class creates a temp directory in the parent process for the use of
|
|
//! the subprocess and its children. To ensure a raceless rundown, it waits on
|
|
//! the child process and any processes directly created by the child before
|
|
//! deleting the temporary directory.
|
|
class WinMultiprocessWithTempDir : public WinMultiprocess {
|
|
public:
|
|
WinMultiprocessWithTempDir();
|
|
|
|
protected:
|
|
void WinMultiprocessParentBeforeChild() override;
|
|
void WinMultiprocessParentAfterChild(HANDLE child) override;
|
|
|
|
//! \brief Returns the path of the temp directory.
|
|
base::FilePath GetTempDirPath() const;
|
|
|
|
private:
|
|
class ScopedEnvironmentVariable {
|
|
public:
|
|
explicit ScopedEnvironmentVariable(const wchar_t* name);
|
|
~ScopedEnvironmentVariable();
|
|
|
|
std::wstring GetValue() const;
|
|
|
|
// Sets this environment variable to |new_value|. If |new_value| is nullptr
|
|
// this environment variable will be undefined.
|
|
void SetValue(const wchar_t* new_value) const;
|
|
|
|
private:
|
|
std::wstring GetValueImpl(bool* is_defined) const;
|
|
|
|
std::wstring original_value_;
|
|
const wchar_t* name_;
|
|
bool was_defined_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(ScopedEnvironmentVariable);
|
|
};
|
|
|
|
std::unique_ptr<ScopedTempDir> temp_dir_;
|
|
ScopedEnvironmentVariable temp_dir_env_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(WinMultiprocessWithTempDir);
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace crashpad
|
|
|
|
#endif // CRASHPAD_TEST_WIN_WIN_MULTIPROCESS_WITH_TEMPDIR_H_
|