3 files changed, 12 insertions, 12 deletions
diff --git a/src/common/dwarf/bytereader_unittest.cc b/src/common/dwarf/bytereader_unittest.cc
index 729c54a8..d839dbe7 100644
--- a/src/common/dwarf/bytereader_unittest.cc
+++ b/src/common/dwarf/bytereader_unittest.cc
@@ -43,10 +43,10 @@ using dwarf2reader::DwarfPointerEncoding;
 using dwarf2reader::ENDIANNESS_BIG;
 using dwarf2reader::ENDIANNESS_LITTLE;
 using google_breakpad::CFISection;
-using google_breakpad::TestAssembler::Label;
-using google_breakpad::TestAssembler::kBigEndian;
-using google_breakpad::TestAssembler::kLittleEndian;
-using google_breakpad::TestAssembler::Section;
+using google_breakpad::test_assembler::Label;
+using google_breakpad::test_assembler::kBigEndian;
+using google_breakpad::test_assembler::kLittleEndian;
+using google_breakpad::test_assembler::Section;
 using std::string;
 using testing::Test;
 
diff --git a/src/common/dwarf/cfi_assembler.h b/src/common/dwarf/cfi_assembler.h
index 7ec1a109..4c9f57de 100644
--- a/src/common/dwarf/cfi_assembler.h
+++ b/src/common/dwarf/cfi_assembler.h
@@ -46,9 +46,9 @@
 namespace google_breakpad {
 
 using dwarf2reader::DwarfPointerEncoding;
-using google_breakpad::TestAssembler::Endianness;
-using google_breakpad::TestAssembler::Label;
-using google_breakpad::TestAssembler::Section;
+using google_breakpad::test_assembler::Endianness;
+using google_breakpad::test_assembler::Label;
+using google_breakpad::test_assembler::Section;
 using std::string;
 
 class CFISection: public Section {
diff --git a/src/common/dwarf/dwarf2reader_cfi_unittest.cc b/src/common/dwarf/dwarf2reader_cfi_unittest.cc
index 7b346fe2..85889f88 100644
--- a/src/common/dwarf/dwarf2reader_cfi_unittest.cc
+++ b/src/common/dwarf/dwarf2reader_cfi_unittest.cc
@@ -63,10 +63,10 @@ extern "C" {
 #include "google_breakpad/common/breakpad_types.h"
 
 using google_breakpad::CFISection;
-using google_breakpad::TestAssembler::Label;
-using google_breakpad::TestAssembler::kBigEndian;
-using google_breakpad::TestAssembler::kLittleEndian;
-using google_breakpad::TestAssembler::Section;
+using google_breakpad::test_assembler::Label;
+using google_breakpad::test_assembler::kBigEndian;
+using google_breakpad::test_assembler::kLittleEndian;
+using google_breakpad::test_assembler::Section;
 
 using dwarf2reader::DwarfPointerEncoding;
 using dwarf2reader::ENDIANNESS_BIG;
@@ -2315,7 +2315,7 @@ TEST_F(CFIReporter, ClearingCFARule) {
 #ifdef WRITE_ELF
 // See comments at the top of the file mentioning WRITE_ELF for details.
 
-using google_breakpad::TestAssembler::Section;
+using google_breakpad::test_assembler::Section;
 
 struct ELFSectionHeader {
   ELFSectionHeader(unsigned int set_type)