UniversalMachExcServer: eliminate multiple implementation inheritance

snapshot/mac/mach_o_image_annotations_reader_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 25 matching lines @@
 #include "util/mach/exception_ports.h"
 #include "util/mach/mach_message_server.h"
 #include "util/test/errors.h"
 #include "util/test/mac/mach_errors.h"
 #include "util/test/mac/mach_multiprocess.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
-class TestMachOImageAnnotationsReader final : public MachMultiprocess,
-                                              public UniversalMachExcServer {
+class TestMachOImageAnnotationsReader final
+    : public MachMultiprocess,
+      public UniversalMachExcServer::Interface {
  public:
   enum TestType {
     // Don’t crash, just test the CrashpadInfo interface.
     kDontCrash = 0,
 
     // The child process should crash by calling abort(). The parent verifies
     // that the system libraries set the expected annotations.
     kCrashAbort,
 
     // The child process should crash by setting DYLD_INSERT_LIBRARIES to
     // contain a nonexistent library. The parent verifies that dyld sets the
     // expected annotations.
     kCrashDyld,
   };
 
   explicit TestMachOImageAnnotationsReader(TestType test_type)
       : MachMultiprocess(),
-        UniversalMachExcServer(),
+        UniversalMachExcServer::Interface(),
         test_type_(test_type) {
   }
 
   ~TestMachOImageAnnotationsReader() {}
 
-  // UniversalMachExcServer:
+  // UniversalMachExcServer::Interface:
   kern_return_t CatchMachException(exception_behavior_t behavior,
                                    exception_handler_t exception_port,
                                    thread_t thread,
                                    task_t task,
                                    exception_type_t exception,
                                    const mach_exception_data_type_t* code,
                                    mach_msg_type_number_t code_count,
                                    thread_state_flavor_t* flavor,
                                    const natural_t* old_state,
                                    mach_msg_type_number_t old_state_count,
@@ skipping 130 matching lines @@
     EXPECT_EQ("y", all_annotations_simple_map["#TEST# x"]);
     EXPECT_EQ("shorter", all_annotations_simple_map["#TEST# longer"]);
     EXPECT_EQ("", all_annotations_simple_map["#TEST# empty_value"]);
 
     // Tell the child process that it’s permitted to crash.
     CheckedWriteFD(WritePipeFD(), &c, sizeof(c));
 
     if (test_type_ != kDontCrash) {
       // Handle the child’s crash. Further validation will be done in
       // CatchMachException().
+      UniversalMachExcServer universal_mach_exc_server(this);
+
       mach_msg_return_t mr =
-          MachMessageServer::Run(this,
+          MachMessageServer::Run(&universal_mach_exc_server,
                                  LocalPort(),
                                  MACH_MSG_OPTION_NONE,
                                  MachMessageServer::kOneShot,
                                  MachMessageServer::kBlocking,
                                  MachMessageServer::kReceiveLargeError,
                                  MACH_MSG_TIMEOUT_NONE);
       EXPECT_EQ(MACH_MSG_SUCCESS, mr)
           << MachErrorMessage(mr, "MachMessageServer::Run");
 
       switch (test_type_) {
@@ skipping 93 matching lines @@
 
 TEST(MachOImageAnnotationsReader, CrashDyld) {
   TestMachOImageAnnotationsReader test_mach_o_image_annotations_reader(
       TestMachOImageAnnotationsReader::kCrashDyld);
   test_mach_o_image_annotations_reader.Run();
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad