This change allows compiling the google-breakpad code using a global ::string class instead of std::string. For more details take a look at common/using_std_string.h

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@974 4c0a9323-5329-0410-9bdc-e9ce6186880e

1 files changed, 4 insertions, 3 deletions

diff --git a/src/common/stabs_reader_unittest.cc b/src/common/stabs_reader_unittest.cc
index 2a9b5d41..35d5e6ca 100644
--- a/src/common/stabs_reader_unittest.cc
+++ b/src/common/stabs_reader_unittest.cc
@@ -43,10 +43,12 @@
 #include <iostream>
 #include <map>
 #include <sstream>
+#include <string>
 
 #include "breakpad_googletest_includes.h"
 #include "common/stabs_reader.h"
 #include "common/test_assembler.h"
+#include "common/using_std_string.h"
 
 using ::testing::Eq;
 using ::testing::InSequence;
@@ -61,7 +63,6 @@ using google_breakpad::test_assembler::Section;
 using google_breakpad::test_assembler::kBigEndian;
 using google_breakpad::test_assembler::kLittleEndian;
 using std::map;
-using std::string;
 
 namespace {
 
@@ -218,10 +219,10 @@ class MockStabsReaderHandler: public StabsHandler {
   MOCK_METHOD3(StartCompilationUnit,
                bool(const char *, uint64_t, const char *));
   MOCK_METHOD1(EndCompilationUnit, bool(uint64_t));
-  MOCK_METHOD2(StartFunction, bool(const std::string &, uint64_t));
+  MOCK_METHOD2(StartFunction, bool(const string &, uint64_t));
   MOCK_METHOD1(EndFunction, bool(uint64_t));
   MOCK_METHOD3(Line, bool(uint64_t, const char *, int));
-  MOCK_METHOD2(Extern, bool(const std::string &, uint64_t));
+  MOCK_METHOD2(Extern, bool(const string &, uint64_t));
   void Warning(const char *format, ...) { MockWarning(format); }
   MOCK_METHOD1(MockWarning, void(const char *));
 };