Remove DISALLOW_* macros in crashpad
This change was partially scripted and partially done manually with vim
regex + manually placing the deleted constructors.
The script change looked for destructors in the public: section of a
class, if that existed the deleted constructors would go before the
destructor.
For manual placement I looked for any constructor in the public: section
of the corresponding class. If there wasn't one, then it would ideally
have gone as the first entry except below enums, classes and typedefs.
This may not have been perfect, but is hopefully good enough. Fingers
crossed.
#include "base/macros.h" is removed from files that don't use
ignore_result, which is the only other thing defined in base/macros.h.
Bug: chromium:1010217
Change-Id: I099526255a40b1ac1264904b4ece2f3f503c9418
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3171034
Reviewed-by: Mark Mentovai <[email protected]>
Commit-Queue: Peter Boström <[email protected]>
diff --git a/handler/mac/crash_report_exception_handler.h b/handler/mac/crash_report_exception_handler.h
index b5a59e4..16c6691 100644
--- a/handler/mac/crash_report_exception_handler.h
+++ b/handler/mac/crash_report_exception_handler.h
@@ -20,7 +20,6 @@
#include <map>
#include <string>
-#include "base/macros.h"
#include "client/crash_report_database.h"
#include "handler/crash_report_upload_thread.h"
#include "handler/user_stream_data_source.h"
@@ -59,6 +58,10 @@
const std::map<std::string, std::string>* process_annotations,
const UserStreamDataSources* user_stream_data_sources);
+ CrashReportExceptionHandler(const CrashReportExceptionHandler&) = delete;
+ CrashReportExceptionHandler& operator=(const CrashReportExceptionHandler&) =
+ delete;
+
~CrashReportExceptionHandler();
// UniversalMachExcServer::Interface:
@@ -86,8 +89,6 @@
CrashReportUploadThread* upload_thread_; // weak
const std::map<std::string, std::string>* process_annotations_; // weak
const UserStreamDataSources* user_stream_data_sources_; // weak
-
- DISALLOW_COPY_AND_ASSIGN(CrashReportExceptionHandler);
};
} // namespace crashpad
diff --git a/handler/mac/exception_handler_server.cc b/handler/mac/exception_handler_server.cc
index 3f30e03..83bb269 100644
--- a/handler/mac/exception_handler_server.cc
+++ b/handler/mac/exception_handler_server.cc
@@ -50,6 +50,10 @@
composite_mach_message_server_.AddHandler(¬ify_server_);
}
+ ExceptionHandlerServerRun(const ExceptionHandlerServerRun&) = delete;
+ ExceptionHandlerServerRun& operator=(const ExceptionHandlerServerRun&) =
+ delete;
+
~ExceptionHandlerServerRun() {
}
@@ -183,8 +187,6 @@
mach_port_t notify_port_; // weak
bool running_;
bool launchd_;
-
- DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerServerRun);
};
} // namespace
diff --git a/handler/mac/exception_handler_server.h b/handler/mac/exception_handler_server.h
index 272cf76..c27ecf3 100644
--- a/handler/mac/exception_handler_server.h
+++ b/handler/mac/exception_handler_server.h
@@ -18,7 +18,6 @@
#include <mach/mach.h>
#include "base/mac/scoped_mach_port.h"
-#include "base/macros.h"
#include "util/mach/exc_server_variants.h"
namespace crashpad {
@@ -37,6 +36,10 @@
//! signal.
ExceptionHandlerServer(base::mac::ScopedMachReceiveRight receive_port,
bool launchd);
+
+ ExceptionHandlerServer(const ExceptionHandlerServer&) = delete;
+ ExceptionHandlerServer& operator=(const ExceptionHandlerServer&) = delete;
+
~ExceptionHandlerServer();
//! \brief Runs the exception-handling server.
@@ -73,8 +76,6 @@
base::mac::ScopedMachReceiveRight receive_port_;
base::mac::ScopedMachReceiveRight notify_port_;
bool launchd_;
-
- DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerServer);
};
} // namespace crashpad
