UniversalMachExcServer: eliminate multiple implementation inheritance

util/mach/exc_client_variants_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 13 matching lines @@
 #include "util/mach/exc_server_variants.h"
 #include "util/mach/exception_behaviors.h"
 #include "util/mach/mach_extensions.h"
 #include "util/test/mac/mach_errors.h"
 #include "util/test/mac/mach_multiprocess.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
-class TestExcClientVariants : public UniversalMachExcServer,
-                              public MachMultiprocess {
+class TestExcClientVariants : public MachMultiprocess,
+                              public UniversalMachExcServer::Interface {
  public:
   TestExcClientVariants(exception_behavior_t behavior, bool all_fields)
-      : UniversalMachExcServer(),
-        MachMultiprocess(),
+      : MachMultiprocess(),
+        UniversalMachExcServer::Interface(),
         behavior_(behavior),
         all_fields_(all_fields),
         handled_(false) {
     ++exception_;
     ++exception_code_;
     ++exception_subcode_;
   }
 
-  // UniversalMachExcServer:
+  // UniversalMachExcServer::Interface:
 
   virtual 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,
@@ skipping 69 matching lines @@
       EXPECT_EQ(nullptr, new_state);
     }
 
     return KERN_SUCCESS;
   }
 
  private:
   // MachMultiprocess:
 
   void MachMultiprocessParent() override {
+    UniversalMachExcServer universal_mach_exc_server(this);
+
     kern_return_t kr =
-        MachMessageServer::Run(this,
+        MachMessageServer::Run(&universal_mach_exc_server,
                                LocalPort(),
                                MACH_MSG_OPTION_NONE,
                                MachMessageServer::kOneShot,
                                MachMessageServer::kBlocking,
                                MachMessageServer::kReceiveLargeError,
                                0);
     EXPECT_EQ(KERN_SUCCESS, kr)
         << MachErrorMessage(kr, "MachMessageServer::Run");
 
     EXPECT_TRUE(handled_);
@@ skipping 134 matching lines @@
 
       TestExcClientVariants test_exc_client_variants(behavior, true);
       test_exc_client_variants.Run();
     }
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad