Allow Chromium's DBus service ownership to be stealable

dbus/test_service.h

Index: dbus/test_service.h
diff --git a/dbus/test_service.h b/dbus/test_service.h
index 765a63080812aafbe10a4a82063e4d6e2080fb25..7ddaf2115502a43a64423b4496f9d2b90d949803 100644
--- a/dbus/test_service.h
+++ b/dbus/test_service.h
@@ -9,6 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
+#include "dbus/bus.h"
 #include "dbus/exported_object.h"
 
 namespace base {
@@ -17,7 +18,6 @@ class SequencedTaskRunner;
 
 namespace dbus {
 
-class Bus;
 class MethodCall;
 class MessageWriter;
 class Response;
@@ -37,6 +37,9 @@ class TestService : public base::Thread {
 
     // NULL by default (i.e. don't use the D-Bus thread).
     scoped_refptr<base::SequencedTaskRunner> dbus_task_runner;
+
+    // Flags governing parameters of service ownership request.
+    Bus::ServiceOwnershipOptions request_ownership_options;
   };
 
   // The number of methods we'll export.
@@ -163,6 +166,9 @@ class TestService : public base::Thread {
   // Helper function for RequestOwnership().
   void RequestOwnershipInternal(base::Callback<void(bool)> callback);
 
+  // Options to use when requesting service ownership.
+  Bus::ServiceOwnershipOptions request_ownership_options_;
+
   scoped_refptr<base::SequencedTaskRunner> dbus_task_runner_;
   base::WaitableEvent on_all_methods_exported_;
   // The number of methods actually exported.