19 files changed, 34 insertions, 35 deletions
diff --git a/src/common/mac/dump_syms.h b/src/common/mac/dump_syms.h
index bfc96374..48f6448c 100644
--- a/src/common/mac/dump_syms.h
+++ b/src/common/mac/dump_syms.h
@@ -29,7 +29,7 @@
 
 // dump_syms.h: Interface for DumpSymbols.  This class will take a mach-o file
 // and extract the symbol information and write it to a file using the
-// airbag symbol file format.  
+// breakpad symbol file format.  
 // NOTE: Only Stabs format is currently supported -- not DWARF.
 
 #import <Foundation/Foundation.h>
diff --git a/src/common/mac/dump_syms.mm b/src/common/mac/dump_syms.mm
index aafed3e7..e1dc9661 100644
--- a/src/common/mac/dump_syms.mm
+++ b/src/common/mac/dump_syms.mm
@@ -1,4 +1,3 @@
-//
 // Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
@@ -45,7 +44,7 @@
 #import "dump_syms.h"
 #import "common/mac/file_id.h"
 
-using google_airbag::FileID;
+using google_breakpad::FileID;
 
 static NSString *kAddressSymbolKey = @"symbol";
 static NSString *kAddressConvertedSymbolKey = @"converted_symbol";
diff --git a/src/common/mac/file_id.cc b/src/common/mac/file_id.cc
index f74f861e..1c7770dd 100644
--- a/src/common/mac/file_id.cc
+++ b/src/common/mac/file_id.cc
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // file_id.cc: Return a unique identifier for a file
 //
 // See file_id.h for documentation
@@ -42,7 +42,7 @@
 
 using MacFileUtilities::MachoID;
 
-namespace google_airbag {
+namespace google_breakpad {
 
 FileID::FileID(const char *path) {
   strlcpy(path_, path, sizeof(path_));
@@ -101,4 +101,4 @@ void FileID::ConvertIdentifierToString(const unsigned char identifier[16],
   buffer[(buffer_idx < buffer_length) ? buffer_idx : buffer_idx - 1] = 0;
 }
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
diff --git a/src/common/mac/file_id.h b/src/common/mac/file_id.h
index 663aa369..eb06b0d6 100644
--- a/src/common/mac/file_id.h
+++ b/src/common/mac/file_id.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // file_id.h: Return a unique identifier for a file
 //
 // Author: Dan Waylonis
@@ -36,7 +36,7 @@
 
 #include <limits.h>
 
-namespace google_airbag {
+namespace google_breakpad {
 
 class FileID {
  public:
@@ -72,7 +72,7 @@ class FileID {
   char path_[PATH_MAX];
 };
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
 
 #endif  // COMMON_MAC_FILE_ID_H__
 
diff --git a/src/common/mac/macho_id.cc b/src/common/mac/macho_id.cc
index 59cd1e21..5fc8bbf8 100644
--- a/src/common/mac/macho_id.cc
+++ b/src/common/mac/macho_id.cc
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // macho_id.cc: Functions to gather identifying information from a macho file
 //
 // See macho_id.h for documentation
diff --git a/src/common/mac/macho_id.h b/src/common/mac/macho_id.h
index d9f02181..039bba38 100644
--- a/src/common/mac/macho_id.h
+++ b/src/common/mac/macho_id.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // macho_id.h: Functions to gather identifying information from a macho file
 //
 // Author: Dan Waylonis
diff --git a/src/common/mac/macho_walker.cc b/src/common/mac/macho_walker.cc
index 81ba3bb5..c14d9eeb 100644
--- a/src/common/mac/macho_walker.cc
+++ b/src/common/mac/macho_walker.cc
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // macho_walker.cc: Iterate over the load commands in a mach-o file
 //
 // See macho_walker.h for documentation
diff --git a/src/common/mac/macho_walker.h b/src/common/mac/macho_walker.h
index eb9575b0..6445a4f4 100644
--- a/src/common/mac/macho_walker.h
+++ b/src/common/mac/macho_walker.h
@@ -26,7 +26,7 @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+
 // macho_walker.h: Iterate over the load commands in a mach-o file
 //
 // Author: Dan Waylonis
diff --git a/src/common/mac/string_utilities.cc b/src/common/mac/string_utilities.cc
index b6b1dc66..57cc19ad 100644
--- a/src/common/mac/string_utilities.cc
+++ b/src/common/mac/string_utilities.cc
@@ -32,7 +32,7 @@
 
 namespace MacStringUtils {
 
-using google_airbag::scoped_array;
+using google_breakpad::scoped_array;
 
 std::string ConvertToString(CFStringRef str) {
   CFIndex length = CFStringGetLength(str);
diff --git a/src/common/string_conversion.cc b/src/common/string_conversion.cc
index 20682045..b61b02fa 100644
--- a/src/common/string_conversion.cc
+++ b/src/common/string_conversion.cc
@@ -34,7 +34,7 @@
 using std::string;
 using std::vector;
 
-namespace google_airbag {
+namespace google_breakpad {
 
 void UTF8ToUTF16(const char *in, vector<u_int16_t> *out) {
   size_t source_length = strlen(in);
@@ -151,4 +151,4 @@ string UTF16ToUTF8(const vector<u_int16_t> &in, bool swap) {
   return "";
 }
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
diff --git a/src/common/string_conversion.h b/src/common/string_conversion.h
index 34195467..83059af7 100644
--- a/src/common/string_conversion.h
+++ b/src/common/string_conversion.h
@@ -35,7 +35,7 @@
 #include <string>
 #include <vector>
 
-namespace google_airbag {
+namespace google_breakpad {
   
 using std::vector;
 
@@ -60,6 +60,6 @@ void UTF32ToUTF16Char(wchar_t in, u_int16_t out[2]);
 // Convert |in| to UTF-8.  If |swap| is true, swap bytes before converting.
 std::string UTF16ToUTF8(const vector<u_int16_t> &in, bool swap);
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
 
 #endif  // COMMON_STRING_CONVERSION_H__
diff --git a/src/common/windows/guid_string.cc b/src/common/windows/guid_string.cc
index 0adc248a..e77432a3 100644
--- a/src/common/windows/guid_string.cc
+++ b/src/common/windows/guid_string.cc
@@ -37,7 +37,7 @@
 
 #include "common/windows/guid_string.h"
 
-namespace google_airbag {
+namespace google_breakpad {
 
 // static
 wstring GUIDString::GUIDToWString(GUID *guid) {
@@ -65,4 +65,4 @@ wstring GUIDString::GUIDToSymbolServerWString(GUID *guid) {
   return wstring(guid_string);
 }
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
diff --git a/src/common/windows/guid_string.h b/src/common/windows/guid_string.h
index c62a341c..f8aa8a23 100644
--- a/src/common/windows/guid_string.h
+++ b/src/common/windows/guid_string.h
@@ -36,7 +36,7 @@
 
 #include <string>
 
-namespace google_airbag {
+namespace google_breakpad {
 
 using std::wstring;
 
@@ -53,6 +53,6 @@ class GUIDString {
   static wstring GUIDToSymbolServerWString(GUID *guid);
 };
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
 
 #endif  // COMMON_WINDOWS_GUID_STRING_H__
diff --git a/src/common/windows/http_upload.cc b/src/common/windows/http_upload.cc
index 2fa48491..5fe3b6dc 100644
--- a/src/common/windows/http_upload.cc
+++ b/src/common/windows/http_upload.cc
@@ -38,12 +38,12 @@
 
 #include "common/windows/http_upload.h"
 
-namespace google_airbag {
+namespace google_breakpad {
 
 using std::ifstream;
 using std::ios;
 
-static const wchar_t kUserAgent[] = L"Airbag/1.0 (Windows)";
+static const wchar_t kUserAgent[] = L"Breakpad/1.0 (Windows)";
 
 // Helper class which closes an internet handle when it goes away
 class HTTPUpload::AutoInternetHandle {
@@ -368,4 +368,4 @@ bool HTTPUpload::CheckParameters(const map<wstring, wstring> &parameters) {
   return true;
 }
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
diff --git a/src/common/windows/http_upload.h b/src/common/windows/http_upload.h
index d458eb19..a1ba7ae1 100644
--- a/src/common/windows/http_upload.h
+++ b/src/common/windows/http_upload.h
@@ -45,7 +45,7 @@
 #include <string>
 #include <vector>
 
-namespace google_airbag {
+namespace google_breakpad {
 
 using std::string;
 using std::wstring;
@@ -118,7 +118,7 @@ class HTTPUpload {
   ~HTTPUpload();
 };
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
 
 #pragma warning( pop )
 
diff --git a/src/common/windows/pdb_source_line_writer.cc b/src/common/windows/pdb_source_line_writer.cc
index 4266dca8..e8684634 100644
--- a/src/common/windows/pdb_source_line_writer.cc
+++ b/src/common/windows/pdb_source_line_writer.cc
@@ -43,7 +43,7 @@
 #define UNDNAME_NO_ECSU 0x8000  // Suppresses enum/class/struct/union.
 #endif  // UNDNAME_NO_ECSU
 
-namespace google_airbag {
+namespace google_breakpad {
 
 PDBSourceLineWriter::PDBSourceLineWriter() : output_(NULL) {
 }
@@ -785,4 +785,4 @@ bool PDBSourceLineWriter::UsesGUID(bool *uses_guid) {
   return true;
 }
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
diff --git a/src/common/windows/pdb_source_line_writer.h b/src/common/windows/pdb_source_line_writer.h
index 58c8f5e0..e91d0737 100644
--- a/src/common/windows/pdb_source_line_writer.h
+++ b/src/common/windows/pdb_source_line_writer.h
@@ -41,7 +41,7 @@ struct IDiaEnumLineNumbers;
 struct IDiaSession;
 struct IDiaSymbol;
 
-namespace google_airbag {
+namespace google_breakpad {
 
 using std::wstring;
 
@@ -158,6 +158,6 @@ class PDBSourceLineWriter {
   void operator=(const PDBSourceLineWriter&);
 };
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
 
 #endif  // _PDB_SOURCE_LINE_WRITER_H__
diff --git a/src/common/windows/string_utils-inl.h b/src/common/windows/string_utils-inl.h
index b2c1d5e7..de6e2e25 100644
--- a/src/common/windows/string_utils-inl.h
+++ b/src/common/windows/string_utils-inl.h
@@ -49,7 +49,7 @@
 #define WIN_STRING_FORMAT_LL "I64"
 #endif  // MSC_VER >= 1400
 
-namespace google_airbag {
+namespace google_breakpad {
 
 using std::string;
 using std::wstring;
@@ -140,6 +140,6 @@ inline void WindowsStringUtils::safe_wcsncpy(wchar_t *destination,
 #endif  // _MSC_VER >= 1400
 }
 
-}  // namespace google_airbag
+}  // namespace google_breakpad
 
 #endif  // COMMON_WINDOWS_STRING_UTILS_INL_H__
diff --git a/src/common/windows/string_utils.cc b/src/common/windows/string_utils.cc
index 3d24caa9..5d464802 100644
--- a/src/common/windows/string_utils.cc
+++ b/src/common/windows/string_utils.cc
@@ -31,7 +31,7 @@
 
 #include "common/windows/string_utils-inl.h"
 
-namespace google_airbag {
+namespace google_breakpad {
 
 // static
 wstring WindowsStringUtils::GetBaseName(const wstring &filename) {
@@ -89,4 +89,4 @@ bool WindowsStringUtils::safe_mbstowcs(const string &mbs, wstring *wcs) {
   return true;
 }
 
-}  // namespace google_airbag
+}  // namespace google_breakpad