Server-side workaround to handle overlapping modules.

src/processor/microdump_processor_unittest.cc

 // Copyright (c) 2014, 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 183 matching lines @@
             state.threads()->at(0)->frames()->at(7)->function_name);
   ASSERT_EQ("breakpad_unittests",
             state.threads()->at(0)->frames()->at(7)->module->code_file());
 }
 
 TEST_F(MicrodumpProcessorTest, TestProcessX86) {
   ProcessState state;
   AnalyzeDump("microdump-x86.dmp", false /* omit_symbols */,
               4 /* expected_cpu_count */, &state);
 
-  ASSERT_EQ(105U, state.modules()->module_count());
+  ASSERT_EQ(124U, state.modules()->module_count());
   ASSERT_EQ("x86", state.system_info()->cpu);
   ASSERT_EQ("asus/WW_Z00A/Z00A:5.0/LRX21V/2.19.40.22_20150627_5104_user:user/"
       "release-keys", state.system_info()->os_version);
   ASSERT_EQ(56U, state.threads()->at(0)->frames()->size());
   ASSERT_EQ("libc.so",
             state.threads()->at(0)->frames()->at(0)->module->debug_file());
   // TODO(mmandlis): Get symbols for the test X86 microdump and test function
   // names.
 }
 
 TEST_F(MicrodumpProcessorTest, TestProcessMultiple) {
   ProcessState state;
   AnalyzeDump("microdump-multiple.dmp", false /* omit_symbols */,
               6 /* expected_cpu_count */, &state);
-  ASSERT_EQ(133U, state.modules()->module_count());
+  ASSERT_EQ(156U, state.modules()->module_count());
   ASSERT_EQ("arm", state.system_info()->cpu);
   ASSERT_EQ("lge/p1_tmo_us/p1:6.0/MRA58K/1603210524c8d:user/release-keys",
             state.system_info()->os_version);
-  ASSERT_EQ(2U, state.threads()->at(0)->frames()->size());
+  ASSERT_EQ(5U, state.threads()->at(0)->frames()->size());
 }
 
 TEST_F(MicrodumpProcessorTest, TestProcessMips) {
   ProcessState state;
   AnalyzeDump("microdump-mips32.dmp", false /* omit_symbols */,
               2 /* expected_cpu_count */, &state);
 
   ASSERT_EQ(7U, state.modules()->module_count());
   ASSERT_EQ("mips", state.system_info()->cpu);
   ASSERT_EQ("3.0.8-g893bf16 #7 SMP PREEMPT Fri Jul 10 15:20:59 PDT 2015",
       state.system_info()->os_version);
   ASSERT_EQ(4U, state.threads()->at(0)->frames()->size());
 
   ASSERT_EQ("blaTest",
             state.threads()->at(0)->frames()->at(0)->function_name);
   ASSERT_EQ("Crash",
             state.threads()->at(0)->frames()->at(1)->function_name);
   ASSERT_EQ("main",
             state.threads()->at(0)->frames()->at(2)->function_name);
   ASSERT_EQ("crash_example",
             state.threads()->at(0)->frames()->at(0)->module->debug_file());
 }
 
 TEST_F(MicrodumpProcessorTest, TestProcessMips64) {
   ProcessState state;
   AnalyzeDump("microdump-mips64.dmp", false /* omit_symbols */,
               1 /* expected_cpu_count */, &state);
 
-  ASSERT_EQ(7U, state.modules()->module_count());
+  ASSERT_EQ(8U, state.modules()->module_count());
   ASSERT_EQ("mips64", state.system_info()->cpu);
   ASSERT_EQ("3.10.0-gf185e20 #112 PREEMPT Mon Oct 5 11:12:49 PDT 2015",
         state.system_info()->os_version);
   ASSERT_EQ(4U, state.threads()->at(0)->frames()->size());
 
   ASSERT_EQ("blaTest",
             state.threads()->at(0)->frames()->at(0)->function_name);
   ASSERT_EQ("Crash",
             state.threads()->at(0)->frames()->at(1)->function_name);
   ASSERT_EQ("main",
             state.threads()->at(0)->frames()->at(2)->function_name);
   ASSERT_EQ("crash_example",
             state.threads()->at(0)->frames()->at(0)->module->debug_file());
 }
 
 }  // namespace
 
 int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }