Merge TP1A.220225.003

Change-Id: Id71ac466dbfe3707fe2e544ce22b1da8f474ec2b

1 files changed, 6 insertions, 7 deletions

diff --git a/system/service/a2dp_source.h b/system/service/a2dp_source.h
index 801393f4d1..5b1b554606 100644
--- a/system/service/a2dp_source.h
+++ b/system/service/a2dp_source.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <base/macros.h>
-
 #include <atomic>
 #include <mutex>
 #include <string>
@@ -50,6 +48,9 @@ class A2dpSource : public BluetoothInstance,
     virtual ~Delegate() = default;
   };
 
+  A2dpSource(const A2dpSource&) = delete;
+  A2dpSource& operator=(const A2dpSource&) = delete;
+
   ~A2dpSource() override;
 
   void SetDelegate(Delegate* delegate);
@@ -99,21 +100,19 @@ class A2dpSource : public BluetoothInstance,
   // delegate function which attempts to take 'clock'.
   std::mutex delegate_mutex_;
   Delegate* delegate_ = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(A2dpSource);
 };
 
 class A2dpSourceFactory : public BluetoothInstanceFactory {
  public:
   A2dpSourceFactory();
+  A2dpSourceFactory(const A2dpSourceFactory&) = delete;
+  A2dpSourceFactory& operator=(const A2dpSourceFactory&) = delete;
+
   ~A2dpSourceFactory() override;
 
   // BluetoothInstanceFactory override:
   bool RegisterInstance(const Uuid& uuid,
                         const RegisterCallback& callback) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(A2dpSourceFactory);
 };
 
 }  // namespace bluetooth