crash-reporter: Include base/macros.h instead of base/basictypes.h
crash-reporter no longer uses the integer types from base/basictypes.h.
It should simply include base/macros.h for the DISALLOW_COPY_AND_ASSIGN
macro instead. This CL also marks several classes
DISALLOW_COPY_AND_ASSIGN.
BUG=None
TEST=`FEATURES=test emerge-$BOARD crash-reporter`
Change-Id: I02c90916fdda63c4d4134ed87b13382ed2fbab26
Reviewed-on: https://chromium-review.googlesource.com/216009
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
diff --git a/crash_reporter/chrome_collector.h b/crash_reporter/chrome_collector.h
index 90e5e38..d8602b9 100644
--- a/crash_reporter/chrome_collector.h
+++ b/crash_reporter/chrome_collector.h
@@ -8,6 +8,7 @@
#include <string>
#include <base/files/file_path.h>
+#include <base/macros.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include "crash-reporter/crash_collector.h"
@@ -48,6 +49,8 @@
const std::string &basename);
FILE *output_file_ptr_;
+
+ DISALLOW_COPY_AND_ASSIGN(ChromeCollector);
};
#endif // CRASH_REPORTER_CHROME_COLLECTOR_H_
diff --git a/crash_reporter/crash_collector.h b/crash_reporter/crash_collector.h
index 49aba12..c98d4a5 100644
--- a/crash_reporter/crash_collector.h
+++ b/crash_reporter/crash_collector.h
@@ -13,6 +13,7 @@
#include <glib.h>
#include <base/files/file_path.h>
+#include <base/macros.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
// User crash collector.
@@ -170,6 +171,9 @@
base::FilePath forced_crash_directory_;
std::string lsb_release_;
base::FilePath log_config_path_;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(CrashCollector);
};
#endif // CRASH_REPORTER_CRASH_COLLECTOR_H_
diff --git a/crash_reporter/kernel_collector.h b/crash_reporter/kernel_collector.h
index 8602564..3899fb0 100644
--- a/crash_reporter/kernel_collector.h
+++ b/crash_reporter/kernel_collector.h
@@ -10,6 +10,7 @@
#include <string>
#include <base/files/file_path.h>
+#include <base/macros.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include "crash-reporter/crash_collector.h"
diff --git a/crash_reporter/kernel_warning_collector.h b/crash_reporter/kernel_warning_collector.h
index 0b20027..f326b23 100644
--- a/crash_reporter/kernel_warning_collector.h
+++ b/crash_reporter/kernel_warning_collector.h
@@ -7,6 +7,7 @@
#include <string>
+#include <base/macros.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include "crash-reporter/crash_collector.h"
@@ -27,6 +28,8 @@
// Reads the full content of the kernel warn dump and its signature.
bool LoadKernelWarning(std::string *content, std::string *signature);
+
+ DISALLOW_COPY_AND_ASSIGN(KernelWarningCollector);
};
#endif // CRASH_REPORTER_KERNEL_WARNING_COLLECTOR_H_
diff --git a/crash_reporter/udev_collector.cc b/crash_reporter/udev_collector.cc
index 5065527..335fa2f 100644
--- a/crash_reporter/udev_collector.cc
+++ b/crash_reporter/udev_collector.cc
@@ -8,7 +8,6 @@
#include <utility>
#include <vector>
-#include <base/basictypes.h>
#include <base/file_util.h>
#include <base/logging.h>
#include <base/strings/string_split.h>
diff --git a/crash_reporter/udev_collector.h b/crash_reporter/udev_collector.h
index 2b9bd34..68eb85a 100644
--- a/crash_reporter/udev_collector.h
+++ b/crash_reporter/udev_collector.h
@@ -8,6 +8,7 @@
#include <string>
#include <base/files/file_path.h>
+#include <base/macros.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include "crash-reporter/crash_collector.h"
@@ -32,6 +33,8 @@
void set_log_config_path(const std::string& path) {
log_config_path_ = base::FilePath(path);
}
+
+ DISALLOW_COPY_AND_ASSIGN(UdevCollector);
};
#endif // CRASH_REPORTER_UDEV_COLLECTOR_H_
diff --git a/crash_reporter/unclean_shutdown_collector.h b/crash_reporter/unclean_shutdown_collector.h
index ed026bd..d30a0b2 100644
--- a/crash_reporter/unclean_shutdown_collector.h
+++ b/crash_reporter/unclean_shutdown_collector.h
@@ -8,6 +8,7 @@
#include <string>
#include <base/files/file_path.h>
+#include <base/macros.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include "crash-reporter/crash_collector.h"
@@ -42,6 +43,8 @@
const char *unclean_shutdown_file_;
base::FilePath powerd_trace_path_;
base::FilePath powerd_suspended_file_;
+
+ DISALLOW_COPY_AND_ASSIGN(UncleanShutdownCollector);
};
#endif // CRASH_REPORTER_UNCLEAN_SHUTDOWN_COLLECTOR_H_
diff --git a/crash_reporter/user_collector.h b/crash_reporter/user_collector.h
index 9f1bb9c..fe2c00b 100644
--- a/crash_reporter/user_collector.h
+++ b/crash_reporter/user_collector.h
@@ -9,6 +9,7 @@
#include <vector>
#include <base/files/file_path.h>
+#include <base/macros.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include "crash-reporter/crash_collector.h"
@@ -177,6 +178,8 @@
static const char *kUserId;
static const char *kGroupId;
+
+ DISALLOW_COPY_AND_ASSIGN(UserCollector);
};
#endif // CRASH_REPORTER_USER_COLLECTOR_H_
