Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 895fa5d9 authored by Ben Chan's avatar Ben Chan Committed by chrome-internal-fetch
Browse files

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: default avatarAlex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: default avatarBen Chan <benchan@chromium.org>
parent f290e987

crash_reporter/chrome_collector.h

+3 −0
Original line number Diff line number Diff line
@@ -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 @@ class ChromeCollector : public CrashCollector { 
                     const std::string &basename);



  FILE *output_file_ptr_;



  DISALLOW_COPY_AND_ASSIGN(ChromeCollector);

};



#endif  // CRASH_REPORTER_CHROME_COLLECTOR_H_

crash_reporter/crash_collector.h

+4 −0
Original line number Diff line number Diff line
@@ -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 @@ class CrashCollector { 
  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_

crash_reporter/kernel_collector.h

+1 −0
Original line number Diff line number Diff line
@@ -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"

crash_reporter/kernel_warning_collector.h

+3 −0
Original line number Diff line number Diff line
@@ -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 @@ class KernelWarningCollector : public CrashCollector { 


  // 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_

crash_reporter/udev_collector.cc

+0 −1
Original line number Diff line number Diff line
@@ -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>