Rename src/common/memory.h to memory_allocator.h.

memory.h shadows a system header which normally isn't a problem
because of the include paths in Breakpad, but the Firefox build
system winds up with src/common in the include path so we've had
a workaround for this for years. Renaming the file lets us get
rid of that workaround and shouldn't hurt anything.

Change-Id: I3b7c4239dc77f3b2b7cf2b572a0cad88cd7e8522
Reviewed-on: https://chromium-review.googlesource.com/723261
Reviewed-by: Mark Mentovai <mark@chromium.org>

6 files changed, 9 insertions, 9 deletions

diff --git a/src/common/common.gyp b/src/common/common.gyp
index 1c97bfc9..9cc90f84 100644
--- a/src/common/common.gyp
+++ b/src/common/common.gyp
@@ -151,7 +151,7 @@
         'mac/super_fat_arch.h',
         'md5.cc',
         'md5.h',
-        'memory.h',
+        'memory_allocator.h',
         'memory_range.h',
         'module.cc',
         'module.h',
@@ -221,8 +221,8 @@
         'linux/tests/crash_generator.cc',
         'linux/tests/crash_generator.h',
         'mac/macho_reader_unittest.cc',
+        'memory_allocator_unittest.cc',
         'memory_range_unittest.cc',
-        'memory_unittest.cc',
         'module_unittest.cc',
         'simple_string_dictionary_unittest.cc',
         'stabs_reader_unittest.cc',
diff --git a/src/common/linux/dump_symbols.cc b/src/common/linux/dump_symbols.cc
index d029ca14..13a545f3 100644
--- a/src/common/linux/dump_symbols.cc
+++ b/src/common/linux/dump_symbols.cc
@@ -64,7 +64,7 @@
 #include "common/linux/elfutils-inl.h"
 #include "common/linux/elf_symbols_to_module.h"
 #include "common/linux/file_id.h"
-#include "common/memory.h"
+#include "common/memory_allocator.h"
 #include "common/module.h"
 #include "common/scoped_ptr.h"
 #ifndef NO_STABS_SUPPORT
diff --git a/src/common/linux/elfutils.h b/src/common/linux/elfutils.h
index 3a77dd08..8fcb6a96 100644
--- a/src/common/linux/elfutils.h
+++ b/src/common/linux/elfutils.h
@@ -37,7 +37,7 @@
 #include <link.h>
 #include <stdint.h>
 
-#include "common/memory.h"
+#include "common/memory_allocator.h"
 
 namespace google_breakpad {
 
diff --git a/src/common/linux/file_id.h b/src/common/linux/file_id.h
index 8ccbadd2..4aff021d 100644
--- a/src/common/linux/file_id.h
+++ b/src/common/linux/file_id.h
@@ -37,7 +37,7 @@
 #include <string>
 
 #include "common/linux/guid_creator.h"
-#include "common/memory.h"
+#include "common/memory_allocator.h"
 #include "common/using_std_string.h"
 
 namespace google_breakpad {
diff --git a/src/common/memory.h b/src/common/memory_allocator.h
index 9158b50c..a3159ea4 100644
--- a/src/common/memory.h
+++ b/src/common/memory_allocator.h
@@ -27,8 +27,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#ifndef GOOGLE_BREAKPAD_COMMON_MEMORY_H_
-#define GOOGLE_BREAKPAD_COMMON_MEMORY_H_
+#ifndef GOOGLE_BREAKPAD_COMMON_MEMORY_ALLOCATOR_H_
+#define GOOGLE_BREAKPAD_COMMON_MEMORY_ALLOCATOR_H_
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -246,4 +246,4 @@ inline void* operator new(size_t nbytes,
   return allocator.Alloc(nbytes);
 }
 
-#endif  // GOOGLE_BREAKPAD_COMMON_MEMORY_H_
+#endif  // GOOGLE_BREAKPAD_COMMON_MEMORY_ALLOCATOR_H_
diff --git a/src/common/memory_unittest.cc b/src/common/memory_allocator_unittest.cc
index 8d2494c2..43c86314 100644
--- a/src/common/memory_unittest.cc
+++ b/src/common/memory_allocator_unittest.cc
@@ -28,7 +28,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "breakpad_googletest_includes.h"
-#include "common/memory.h"
+#include "common/memory_allocator.h"
 
 using namespace google_breakpad;