Refactoring in preparation for microdump processing

src/processor/minidump_processor_unittest.cc

 // Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 75 matching lines @@
   MockMinidumpMemoryList() : MinidumpMemoryList(NULL) {}
 
   MOCK_METHOD1(GetMemoryRegionForAddress, MinidumpMemoryRegion*(uint64_t));
 };
 
 class MockMinidumpThread : public MinidumpThread {
  public:
   MockMinidumpThread() : MinidumpThread(NULL) {}
 
   MOCK_CONST_METHOD1(GetThreadID, bool(uint32_t*));
-  MOCK_METHOD0(GetContext, DumpContext*());
+  MOCK_METHOD0(GetContext, MinidumpContext*());
   MOCK_METHOD0(GetMemory, MinidumpMemoryRegion*());
   MOCK_CONST_METHOD0(GetStartOfStackMemoryRange, uint64_t());
 };
 
 // This is crappy, but MinidumpProcessor really does want a
 // MinidumpMemoryRegion.
 class MockMinidumpMemoryRegion : public MinidumpMemoryRegion {
  public:
   MockMinidumpMemoryRegion(uint64_t base, const string& contents) :
       MinidumpMemoryRegion(NULL) {
@@ skipping 19 matching lines @@
   MockMemoryRegion region_;
 };
 
 }  // namespace google_breakpad
 
 namespace {
 
 using google_breakpad::BasicSourceLineResolver;
 using google_breakpad::CallStack;
 using google_breakpad::CodeModule;
-using google_breakpad::DumpContext;
+using google_breakpad::MinidumpContext;
 using google_breakpad::MinidumpMemoryRegion;
 using google_breakpad::MinidumpProcessor;
 using google_breakpad::MinidumpSystemInfo;
 using google_breakpad::MinidumpThreadList;
 using google_breakpad::MinidumpThread;
 using google_breakpad::MockMinidump;
 using google_breakpad::MockMinidumpMemoryList;
 using google_breakpad::MockMinidumpMemoryRegion;
 using google_breakpad::MockMinidumpThread;
 using google_breakpad::MockMinidumpThreadList;
@@ skipping 140 matching lines @@
   explicit TestMinidumpSystemInfo(MDRawSystemInfo info) :
       MinidumpSystemInfo(NULL) {
     valid_ = true;
     system_info_ = info;
     csd_version_ = new string("");
   }
 };
 
 // A test minidump context, just returns the MDRawContextX86
 // fed to it.
-class TestMinidumpContext : public DumpContext {
+class TestMinidumpContext : public MinidumpContext {
  public:
   explicit TestMinidumpContext(const MDRawContextX86& context) :
-      DumpContext() {
+      MinidumpContext(NULL) {
     valid_ = true;
     SetContextX86(new MDRawContextX86(context));
     SetContextFlags(MD_CONTEXT_X86);
   }
 };
 
 class MinidumpProcessorTest : public ::testing::Test {
 };
 
 TEST_F(MinidumpProcessorTest, TestCorruptMinidumps) {
@@ skipping 243 matching lines @@
   MockMinidumpMemoryList memory_list;
   EXPECT_CALL(dump, GetMemoryList()).
       WillOnce(Return(&memory_list));
 
   // Return a thread missing a thread context.
   MockMinidumpThread no_context_thread;
   EXPECT_CALL(no_context_thread, GetThreadID(_)).
     WillRepeatedly(DoAll(SetArgumentPointee<0>(1),
                          Return(true)));
   EXPECT_CALL(no_context_thread, GetContext()).
-    WillRepeatedly(Return(reinterpret_cast<DumpContext*>(NULL)));
+    WillRepeatedly(Return(reinterpret_cast<MinidumpContext*>(NULL)));
 
   // The memory contents don't really matter here, since it won't be used.
   MockMinidumpMemoryRegion no_context_thread_memory(0x1234, "xxx");
   EXPECT_CALL(no_context_thread, GetMemory()).
     WillRepeatedly(Return(&no_context_thread_memory));
   EXPECT_CALL(no_context_thread, GetStartOfStackMemoryRange()).
     Times(0);
   EXPECT_CALL(memory_list, GetMemoryRegionForAddress(_)).
     Times(0);
 
@@ skipping 11 matching lines @@
   ASSERT_EQ(1U, state.threads()->size());
   ASSERT_EQ(0U, state.threads()->at(0)->frames()->size());
 }
 
 }  // namespace
 
 int main(int argc, char *argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }