diff --git a/chromecast/app/android/crash_handler.h b/chromecast/app/android/crash_handler.h index 6af19a67fd3dcd..e9bdbf853cee7d 100644 --- a/chromecast/app/android/crash_handler.h +++ b/chromecast/app/android/crash_handler.h @@ -18,6 +18,9 @@ class CastCrashReporterClientAndroid; class CrashHandler { public: + CrashHandler(const CrashHandler&) = delete; + CrashHandler& operator=(const CrashHandler&) = delete; + // Initializes the crash handler for attempting to upload crash dumps with // the current process's log file. // Must not be called more than once. @@ -54,8 +57,6 @@ class CrashHandler { std::string process_type_; std::unique_ptr crash_reporter_client_; - - DISALLOW_COPY_AND_ASSIGN(CrashHandler); }; } // namespace chromecast diff --git a/chromecast/app/linux/cast_crash_reporter_client_unittest.cc b/chromecast/app/linux/cast_crash_reporter_client_unittest.cc index 7a8ad6b382d144..0a2bfeee58c4d6 100644 --- a/chromecast/app/linux/cast_crash_reporter_client_unittest.cc +++ b/chromecast/app/linux/cast_crash_reporter_client_unittest.cc @@ -41,6 +41,11 @@ int WriteFakeDumpStateFile(const std::string& path) { } // namespace class CastCrashReporterClientTest : public testing::Test { + public: + CastCrashReporterClientTest(const CastCrashReporterClientTest&) = delete; + CastCrashReporterClientTest& operator=(const CastCrashReporterClientTest&) = + delete; + protected: CastCrashReporterClientTest() {} ~CastCrashReporterClientTest() override {} @@ -117,8 +122,6 @@ class CastCrashReporterClientTest : public testing::Test { base::ScopedTempDir fake_home_dir_; ScopedTempFile minidump_; std::unique_ptr home_override_; - - DISALLOW_COPY_AND_ASSIGN(CastCrashReporterClientTest); }; TEST_F(CastCrashReporterClientTest, EndToEndTestOnIORestrictedThread) { diff --git a/chromecast/base/android/dumpstate_writer.h b/chromecast/base/android/dumpstate_writer.h index 61a0bb4587f6f4..1c129d0b3c2a3d 100644 --- a/chromecast/base/android/dumpstate_writer.h +++ b/chromecast/base/android/dumpstate_writer.h @@ -16,10 +16,11 @@ namespace chromecast { // JNI wrapper for DumpstateWriter.java. class DumpstateWriter { public: - static void AddDumpValue(const std::string& name, const std::string& value); + DumpstateWriter() = delete; + DumpstateWriter(const DumpstateWriter&) = delete; + DumpstateWriter& operator=(const DumpstateWriter&) = delete; - private: - DISALLOW_IMPLICIT_CONSTRUCTORS(DumpstateWriter); + static void AddDumpValue(const std::string& name, const std::string& value); }; } // namespace chromecast diff --git a/chromecast/base/cast_resource.h b/chromecast/base/cast_resource.h index fa6b0e594a8198..f5be3cda216973 100644 --- a/chromecast/base/cast_resource.h +++ b/chromecast/base/cast_resource.h @@ -69,6 +69,9 @@ class CastResource { virtual ~Client() {} }; + CastResource(const CastResource&) = delete; + CastResource& operator=(const CastResource&) = delete; + // Sets the Client for the CastResource to respond to when it is done with // Acquire/ReleaseResource. void SetCastResourceClient(Client* client); @@ -95,8 +98,6 @@ class CastResource { private: Client* client_; - - DISALLOW_COPY_AND_ASSIGN(CastResource); }; } // namespace chromecast diff --git a/chromecast/base/chromecast_config_android.h b/chromecast/base/chromecast_config_android.h index cd293023b1b3d2..195ed792087fce 100644 --- a/chromecast/base/chromecast_config_android.h +++ b/chromecast/base/chromecast_config_android.h @@ -15,6 +15,9 @@ class ChromecastConfigAndroid { public: static ChromecastConfigAndroid* GetInstance(); + ChromecastConfigAndroid(const ChromecastConfigAndroid&) = delete; + ChromecastConfigAndroid& operator=(const ChromecastConfigAndroid&) = delete; + // Returns whether or not the user has allowed sending usage stats and // crash reports. // TODO(ziyangch): Remove CanSendUsageStats() and switch to pure callback @@ -36,9 +39,6 @@ class ChromecastConfigAndroid { ChromecastConfigAndroid() {} virtual ~ChromecastConfigAndroid() {} - - private: - DISALLOW_COPY_AND_ASSIGN(ChromecastConfigAndroid); }; } // namespace android diff --git a/chromecast/base/component/component.cc b/chromecast/base/component/component.cc index ce66eb11dfd6b6..fbc166c201f419 100644 --- a/chromecast/base/component/component.cc +++ b/chromecast/base/component/component.cc @@ -34,6 +34,9 @@ class DependencyCount : public base::RefCountedThreadSafe { DCHECK(component_); } + DependencyCount(const DependencyCount&) = delete; + DependencyCount& operator=(const DependencyCount&) = delete; + void Detach() { DCHECK(task_runner_->BelongsToCurrentThread()); component_ = nullptr; @@ -160,8 +163,6 @@ class DependencyCount : public base::RefCountedThreadSafe { AtomicWord dep_count_; bool disabling_; std::set strong_dependents_; - - DISALLOW_COPY_AND_ASSIGN(DependencyCount); }; DependencyBase::DependencyBase(const WeakReferenceBase& dependency, diff --git a/chromecast/base/component/component.h b/chromecast/base/component/component.h index 3855e7e78151d9..1067185662989c 100644 --- a/chromecast/base/component/component.h +++ b/chromecast/base/component/component.h @@ -175,6 +175,9 @@ class ComponentBase { virtual ~Observer() {} }; + ComponentBase(const ComponentBase&) = delete; + ComponentBase& operator=(const ComponentBase&) = delete; + virtual ~ComponentBase(); // Enables this component if possible. Attempts to enable all strong @@ -266,8 +269,6 @@ class ComponentBase { bool async_call_in_progress_; int pending_dependency_count_; const scoped_refptr> observers_; - - DISALLOW_COPY_AND_ASSIGN(ComponentBase); }; template @@ -276,13 +277,13 @@ class StrongDependency : public subtle::DependencyBase { StrongDependency(const WeakReference& dependency, ComponentBase* dependent) : subtle::DependencyBase(dependency, dependent) {} + StrongDependency(const StrongDependency&) = delete; + StrongDependency& operator=(const StrongDependency&) = delete; + C* operator->() const { DCHECK(dependency_); return static_cast(dependency_); } - - private: - DISALLOW_COPY_AND_ASSIGN(StrongDependency); }; template @@ -316,10 +317,10 @@ class Component : public ComponentBase { Component() = default; - WeakRef GetRef() { return WeakRef(*static_cast(this)); } + Component(const Component&) = delete; + Component& operator=(const Component&) = delete; - private: - DISALLOW_COPY_AND_ASSIGN(Component); + WeakRef GetRef() { return WeakRef(*static_cast(this)); } }; } // namespace chromecast diff --git a/chromecast/base/device_capabilities.h b/chromecast/base/device_capabilities.h index a677f439acab01..87aae64fda98af 100644 --- a/chromecast/base/device_capabilities.h +++ b/chromecast/base/device_capabilities.h @@ -71,6 +71,9 @@ class DeviceCapabilities { // Validator class and implement its interface. class Validator { public: + Validator(const Validator&) = delete; + Validator& operator=(const Validator&) = delete; + // |path| is full path to capability, which could include paths expanded on // the capability key that gets registered through the Register() method. // For example, if a key of "foo" is registered for a Validator, |path| @@ -101,8 +104,6 @@ class DeviceCapabilities { private: DeviceCapabilities* const capabilities_; - - DISALLOW_COPY_AND_ASSIGN(Validator); }; // Class used to store/own capabilities-related data. It is immutable and @@ -110,6 +111,9 @@ class DeviceCapabilities { // lifetime without worrying about the data getting invalidated in any way. class Data : public base::RefCountedThreadSafe { public: + Data(const Data&) = delete; + Data& operator=(const Data&) = delete; + // Accessor for complete capabilities in dictionary format. const base::Value& dictionary() const { return dictionary_; } @@ -130,8 +134,6 @@ class DeviceCapabilities { const base::Value dictionary_; std::string json_string_; - - DISALLOW_COPY_AND_ASSIGN(Data); }; // Default Capability keys @@ -140,6 +142,9 @@ class DeviceCapabilities { static const char kKeyDisplaySupported[]; static const char kKeyHiResAudioSupported[]; + DeviceCapabilities(const DeviceCapabilities&) = delete; + DeviceCapabilities& operator=(const DeviceCapabilities&) = delete; + // This class should get destroyed after all Validators have been // unregistered, all Observers have been removed, and the class is no longer // being accessed. @@ -245,8 +250,6 @@ class DeviceCapabilities { // visible in GetAllData(). virtual void SetPrivateValidatedValue(const std::string& path, base::Value new_value) = 0; - - DISALLOW_COPY_AND_ASSIGN(DeviceCapabilities); }; } // namespace chromecast diff --git a/chromecast/base/metrics/cast_metrics_helper.h b/chromecast/base/metrics/cast_metrics_helper.h index 2898ecb8f201c6..6e07511a26a146 100644 --- a/chromecast/base/metrics/cast_metrics_helper.h +++ b/chromecast/base/metrics/cast_metrics_helper.h @@ -70,6 +70,9 @@ class CastMetricsHelper { static CastMetricsHelper* GetInstance(); + CastMetricsHelper(const CastMetricsHelper&) = delete; + CastMetricsHelper& operator=(const CastMetricsHelper&) = delete; + // This records the startup time of an app load (note: another app // may be running and still collecting metrics). virtual void DidStartLoad(const std::string& app_id); @@ -186,8 +189,6 @@ class CastMetricsHelper { // Default RecordAction callback when metrics_sink_ is not set. RecordActionCallback record_action_callback_; - - DISALLOW_COPY_AND_ASSIGN(CastMetricsHelper); }; } // namespace metrics diff --git a/chromecast/base/observer.h b/chromecast/base/observer.h index 7b16a8283bc2fa..8c5c445c64ba97 100644 --- a/chromecast/base/observer.h +++ b/chromecast/base/observer.h @@ -133,6 +133,8 @@ class Observer { public: Observer(const Observer& other); + Observer& operator=(const Observer&) = delete; + ~Observer(); void SetOnUpdateCallback(base::RepeatingClosure callback) { @@ -158,8 +160,6 @@ class Observer { const T& value_; base::RepeatingClosure on_update_callback_; SEQUENCE_CHECKER(sequence_checker_); - - DISALLOW_ASSIGN(Observer); }; template @@ -171,6 +171,10 @@ class Observable { public: explicit Observable(const T& initial_value); + + Observable(const Observable&) = delete; + Observable& operator=(const Observable&) = delete; + Observer Observe(); void SetValue(const T& new_value); @@ -181,8 +185,6 @@ class Observable { // By using a refcounted object to store the value and observer list, we can // avoid tying the lifetime of Observable to its Observers or vice versa. const scoped_refptr> internals_; - - DISALLOW_COPY_AND_ASSIGN(Observable); }; namespace subtle { @@ -194,6 +196,9 @@ class ObservableInternals explicit ObservableInternals(const T& initial_value) : value_(initial_value) {} + ObservableInternals(const ObservableInternals&) = delete; + ObservableInternals& operator=(const ObservableInternals&) = delete; + void SetValue(const T& new_value) { base::AutoLock lock(lock_); value_ = new_value; @@ -259,6 +264,9 @@ class ObservableInternals public: explicit SequenceOwnedInfo(const T& value) : value_(value) {} + SequenceOwnedInfo(const SequenceOwnedInfo&) = delete; + SequenceOwnedInfo& operator=(const SequenceOwnedInfo&) = delete; + const T& value() const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); return value_; @@ -301,8 +309,6 @@ class ObservableInternals std::vector*> observers_; T value_; SEQUENCE_CHECKER(sequence_checker_); - - DISALLOW_COPY_AND_ASSIGN(SequenceOwnedInfo); }; class PerSequenceInfo { @@ -371,8 +377,6 @@ class ObservableInternals mutable base::Lock lock_; T value_; std::vector per_sequence_; - - DISALLOW_COPY_AND_ASSIGN(ObservableInternals); }; } // namespace subtle diff --git a/chromecast/base/observer_unittest.cc b/chromecast/base/observer_unittest.cc index e317d876a0dc80..7316192cca8973 100644 --- a/chromecast/base/observer_unittest.cc +++ b/chromecast/base/observer_unittest.cc @@ -35,6 +35,9 @@ class ThreadedObservable { thread_.Start(); } + ThreadedObservable(const ThreadedObservable&) = delete; + ThreadedObservable& operator=(const ThreadedObservable&) = delete; + Observer Observe() { return value_.Observe(); } void SetValue(int value) { @@ -51,8 +54,6 @@ class ThreadedObservable { base::Thread thread_; Observable value_; - - DISALLOW_COPY_AND_ASSIGN(ThreadedObservable); }; class ThreadedObserver { diff --git a/chromecast/base/system_time_change_notifier.h b/chromecast/base/system_time_change_notifier.h index d4cad93e49139e..99950cf0e58ff0 100644 --- a/chromecast/base/system_time_change_notifier.h +++ b/chromecast/base/system_time_change_notifier.h @@ -30,6 +30,9 @@ class SystemTimeChangeNotifier { virtual ~Observer() {} }; + SystemTimeChangeNotifier(const SystemTimeChangeNotifier&) = delete; + SystemTimeChangeNotifier& operator=(const SystemTimeChangeNotifier&) = delete; + virtual ~SystemTimeChangeNotifier(); void AddObserver(Observer* observer); @@ -43,8 +46,6 @@ class SystemTimeChangeNotifier { private: scoped_refptr> observer_list_; - - DISALLOW_COPY_AND_ASSIGN(SystemTimeChangeNotifier); }; // Default implementation of SystemTimeChangeNotifier for most platform. diff --git a/chromecast/base/system_time_change_notifier_unittest.cc b/chromecast/base/system_time_change_notifier_unittest.cc index b6bbfe3128e8da..c73d432a2c7de9 100644 --- a/chromecast/base/system_time_change_notifier_unittest.cc +++ b/chromecast/base/system_time_change_notifier_unittest.cc @@ -26,6 +26,10 @@ class SequencedTaskRunnerNoDelay : public base::SequencedTaskRunner { public: SequencedTaskRunnerNoDelay() {} + SequencedTaskRunnerNoDelay(const SequencedTaskRunnerNoDelay&) = delete; + SequencedTaskRunnerNoDelay& operator=(const SequencedTaskRunnerNoDelay&) = + delete; + // base::SequencedTaskRunner implementation: bool PostDelayedTask(const base::Location& from_here, base::OnceClosure task, @@ -44,8 +48,6 @@ class SequencedTaskRunnerNoDelay : public base::SequencedTaskRunner { private: ~SequencedTaskRunnerNoDelay() override {} - - DISALLOW_COPY_AND_ASSIGN(SequencedTaskRunnerNoDelay); }; class TimeChangeObserver : public SystemTimeChangeNotifier::Observer { diff --git a/chromecast/bindings/bindings_manager_cast_browsertest.cc b/chromecast/bindings/bindings_manager_cast_browsertest.cc index 7c17097fa91177..5d6c3deda33018 100644 --- a/chromecast/bindings/bindings_manager_cast_browsertest.cc +++ b/chromecast/bindings/bindings_manager_cast_browsertest.cc @@ -124,6 +124,12 @@ class MockWebContentsDelegate : public content::WebContentsDelegate { // Test class // ============================================================================= class BindingsManagerCastBrowserTest : public content::BrowserTestBase { + public: + BindingsManagerCastBrowserTest(const BindingsManagerCastBrowserTest&) = + delete; + BindingsManagerCastBrowserTest& operator=( + const BindingsManagerCastBrowserTest&) = delete; + protected: BindingsManagerCastBrowserTest() = default; ~BindingsManagerCastBrowserTest() override = default; @@ -177,9 +183,6 @@ class BindingsManagerCastBrowserTest : public content::BrowserTestBase { std::unique_ptr cast_web_contents_; std::unique_ptr bindings_manager_; - - private: - DISALLOW_COPY_AND_ASSIGN(BindingsManagerCastBrowserTest); }; // Handles connected ports from the NamedMessagePortConnector and diff --git a/chromecast/browser/accessibility/flutter/ax_tree_source_flutter.h b/chromecast/browser/accessibility/flutter/ax_tree_source_flutter.h index e44ea939b1fab7..6c07d345a85c05 100644 --- a/chromecast/browser/accessibility/flutter/ax_tree_source_flutter.h +++ b/chromecast/browser/accessibility/flutter/ax_tree_source_flutter.h @@ -104,6 +104,10 @@ class AXTreeSourceFlutter : public ui::AXTreeSource, content::WebContents* web_contents, chromecast::accessibility::AXTreeSourceFlutter* ax_tree_source); + AXTreeWebContentsObserver(const AXTreeWebContentsObserver&) = delete; + AXTreeWebContentsObserver& operator=(const AXTreeWebContentsObserver&) = + delete; + void RenderFrameHostChanged(content::RenderFrameHost* old_host, content::RenderFrameHost* new_host) override; @@ -111,8 +115,6 @@ class AXTreeSourceFlutter : public ui::AXTreeSource, private: chromecast::accessibility::AXTreeSourceFlutter* ax_tree_source_; - - DISALLOW_COPY_AND_ASSIGN(AXTreeWebContentsObserver); }; using AXTreeFlutterSerializer = ui::AXTreeSerializer; diff --git a/chromecast/browser/accessibility/touch_exploration_controller_unittest.cc b/chromecast/browser/accessibility/touch_exploration_controller_unittest.cc index 67e7c95e43a6e3..c1a63e7bd9d03e 100644 --- a/chromecast/browser/accessibility/touch_exploration_controller_unittest.cc +++ b/chromecast/browser/accessibility/touch_exploration_controller_unittest.cc @@ -144,6 +144,11 @@ class TouchExplorationControllerTestApi { touch_exploration_controller_.reset(touch_exploration_controller); } + TouchExplorationControllerTestApi(const TouchExplorationControllerTestApi&) = + delete; + TouchExplorationControllerTestApi& operator=( + const TouchExplorationControllerTestApi&) = delete; + void CallTapTimerNowForTesting() { DCHECK(touch_exploration_controller_->tap_timer_.IsRunning()); touch_exploration_controller_->tap_timer_.Stop(); @@ -222,8 +227,6 @@ class TouchExplorationControllerTestApi { private: std::unique_ptr touch_exploration_controller_; - - DISALLOW_COPY_AND_ASSIGN(TouchExplorationControllerTestApi); }; class TouchExplorationTest : public aura::test::AuraTestBase { diff --git a/chromecast/browser/cast_extension_message_filter.h b/chromecast/browser/cast_extension_message_filter.h index 3bc27af3b3eabd..0af27bcd2fa8b5 100644 --- a/chromecast/browser/cast_extension_message_filter.h +++ b/chromecast/browser/cast_extension_message_filter.h @@ -31,6 +31,10 @@ class CastExtensionMessageFilter : public content::BrowserMessageFilter { CastExtensionMessageFilter(int render_process_id, content::BrowserContext* context); + CastExtensionMessageFilter(const CastExtensionMessageFilter&) = delete; + CastExtensionMessageFilter& operator=(const CastExtensionMessageFilter&) = + delete; + // content::BrowserMessageFilter methods: bool OnMessageReceived(const IPC::Message& message) override; void OnDestruct() const override; @@ -54,8 +58,6 @@ class CastExtensionMessageFilter : public content::BrowserMessageFilter { content::BrowserContext* context_; scoped_refptr extension_info_map_; - - DISALLOW_COPY_AND_ASSIGN(CastExtensionMessageFilter); }; #endif // CHROMECAST_BROWSER_CAST_EXTENSION_MESSAGE_FILTER_H_ diff --git a/chromecast/browser/cast_extension_url_loader_factory.cc b/chromecast/browser/cast_extension_url_loader_factory.cc index 286ef2da7888ae..d5e6ba8459b8ef 100644 --- a/chromecast/browser/cast_extension_url_loader_factory.cc +++ b/chromecast/browser/cast_extension_url_loader_factory.cc @@ -50,6 +50,9 @@ class CastExtensionURLLoader : public network::mojom::URLLoader, traffic_annotation, network_factory); } + CastExtensionURLLoader(const CastExtensionURLLoader&) = delete; + CastExtensionURLLoader& operator=(const CastExtensionURLLoader&) = delete; + private: CastExtensionURLLoader( mojo::PendingReceiver loader_receiver, @@ -171,8 +174,6 @@ class CastExtensionURLLoader : public network::mojom::URLLoader, // This is the URLLoader from the network URLLoaderFactory. mojo::Remote network_loader_; - - DISALLOW_COPY_AND_ASSIGN(CastExtensionURLLoader); }; } // namespace diff --git a/chromecast/browser/cast_extension_url_loader_factory.h b/chromecast/browser/cast_extension_url_loader_factory.h index 350f154aceb42e..79d0591f629706 100644 --- a/chromecast/browser/cast_extension_url_loader_factory.h +++ b/chromecast/browser/cast_extension_url_loader_factory.h @@ -47,6 +47,10 @@ class CastExtensionURLLoaderFactory content::BrowserContext* browser_context, mojo::PendingRemote extension_factory); + CastExtensionURLLoaderFactory(const CastExtensionURLLoaderFactory&) = delete; + CastExtensionURLLoaderFactory& operator=( + const CastExtensionURLLoaderFactory&) = delete; + static void EnsureShutdownNotifierFactoryBuilt(); private: @@ -92,8 +96,6 @@ class CastExtensionURLLoaderFactory scoped_refptr network_factory_; base::CallbackListSubscription browser_context_shutdown_subscription_; - - DISALLOW_COPY_AND_ASSIGN(CastExtensionURLLoaderFactory); }; } // namespace shell diff --git a/chromecast/browser/cast_media_blocker_browsertest.cc b/chromecast/browser/cast_media_blocker_browsertest.cc index edbec2ffdb01a4..86b1f18cf6248c 100644 --- a/chromecast/browser/cast_media_blocker_browsertest.cc +++ b/chromecast/browser/cast_media_blocker_browsertest.cc @@ -29,6 +29,10 @@ class CastMediaBlockerBrowserTest : public CastBrowserTest { public: CastMediaBlockerBrowserTest() {} + CastMediaBlockerBrowserTest(const CastMediaBlockerBrowserTest&) = delete; + CastMediaBlockerBrowserTest& operator=(const CastMediaBlockerBrowserTest&) = + delete; + protected: // CastBrowserTest implementation. void TearDownOnMainThread() override { @@ -85,8 +89,6 @@ class CastMediaBlockerBrowserTest : public CastBrowserTest { private: content::WebContents* web_contents_; std::unique_ptr blocker_; - - DISALLOW_COPY_AND_ASSIGN(CastMediaBlockerBrowserTest); }; IN_PROC_BROWSER_TEST_F(CastMediaBlockerBrowserTest, Audio_BlockUnblock) { diff --git a/chromecast/browser/cast_navigation_ui_data.h b/chromecast/browser/cast_navigation_ui_data.h index 6306ece0eecf39..3ce7d86f1050c9 100644 --- a/chromecast/browser/cast_navigation_ui_data.h +++ b/chromecast/browser/cast_navigation_ui_data.h @@ -27,14 +27,15 @@ class CastNavigationUIData : public content::NavigationUIData { explicit CastNavigationUIData(const std::string& session_id); + CastNavigationUIData(const CastNavigationUIData&) = delete; + CastNavigationUIData& operator=(const CastNavigationUIData&) = delete; + const std::string& session_id() const { return session_id_; } std::unique_ptr Clone() override; private: std::string session_id_; - - DISALLOW_COPY_AND_ASSIGN(CastNavigationUIData); }; } // namespace shell diff --git a/chromecast/browser/cast_network_contexts.cc b/chromecast/browser/cast_network_contexts.cc index fe205b2ff62a14..42f5978c29cf03 100644 --- a/chromecast/browser/cast_network_contexts.cc +++ b/chromecast/browser/cast_network_contexts.cc @@ -63,6 +63,10 @@ class CastNetworkContexts::URLLoaderFactoryForSystem DETACH_FROM_SEQUENCE(sequence_checker_); } + URLLoaderFactoryForSystem(const URLLoaderFactoryForSystem&) = delete; + URLLoaderFactoryForSystem& operator=(const URLLoaderFactoryForSystem&) = + delete; + // mojom::URLLoaderFactory implementation: void CreateLoaderAndStart( mojo::PendingReceiver receiver, @@ -102,8 +106,6 @@ class CastNetworkContexts::URLLoaderFactoryForSystem SEQUENCE_CHECKER(sequence_checker_); CastNetworkContexts* network_context_; - - DISALLOW_COPY_AND_ASSIGN(URLLoaderFactoryForSystem); }; CastNetworkContexts::CastNetworkContexts( diff --git a/chromecast/browser/cast_quota_permission_context.h b/chromecast/browser/cast_quota_permission_context.h index 30648c12acdb59..396fa2a5372f88 100644 --- a/chromecast/browser/cast_quota_permission_context.h +++ b/chromecast/browser/cast_quota_permission_context.h @@ -14,6 +14,10 @@ class CastQuotaPermissionContext : public content::QuotaPermissionContext { public: CastQuotaPermissionContext(); + CastQuotaPermissionContext(const CastQuotaPermissionContext&) = delete; + CastQuotaPermissionContext& operator=(const CastQuotaPermissionContext&) = + delete; + // content::QuotaPermissionContext implementation: void RequestQuotaPermission(const content::StorageQuotaParams& params, int render_process_id, @@ -21,8 +25,6 @@ class CastQuotaPermissionContext : public content::QuotaPermissionContext { private: ~CastQuotaPermissionContext() override; - - DISALLOW_COPY_AND_ASSIGN(CastQuotaPermissionContext); }; } // namespace chromecast diff --git a/chromecast/browser/cast_session_id_map.h b/chromecast/browser/cast_session_id_map.h index 828060b2b8476f..60abab7e2c0b7d 100644 --- a/chromecast/browser/cast_session_id_map.h +++ b/chromecast/browser/cast_session_id_map.h @@ -36,6 +36,10 @@ class CastSessionIdMap : public media::CastAudioManagerHelper::Delegate { // This must be called for the first time on the browser main thread. static CastSessionIdMap* GetInstance( base::SequencedTaskRunner* task_runner = nullptr); + + CastSessionIdMap(const CastSessionIdMap&) = delete; + CastSessionIdMap& operator=(const CastSessionIdMap&) = delete; + // Map a session id to a particular group id in the provided WebContents. // Record whether the session is an audio only session. // Can be called on any thread. @@ -92,8 +96,6 @@ class CastSessionIdMap : public media::CastAudioManagerHelper::Delegate { group_info_mapping_; base::SequencedTaskRunner* const task_runner_; SEQUENCE_CHECKER(sequence_checker_); - - DISALLOW_COPY_AND_ASSIGN(CastSessionIdMap); }; } // namespace shell diff --git a/chromecast/browser/cast_session_id_map_unittest.cc b/chromecast/browser/cast_session_id_map_unittest.cc index 2d71d2677dc3e2..f743b8afe6ef99 100644 --- a/chromecast/browser/cast_session_id_map_unittest.cc +++ b/chromecast/browser/cast_session_id_map_unittest.cc @@ -25,6 +25,9 @@ class CastSessionIdMapTest : public content::RenderViewHostTestHarness { public: CastSessionIdMapTest() : task_runner_(new base::TestSimpleTaskRunner) {} + CastSessionIdMapTest(const CastSessionIdMapTest&) = delete; + CastSessionIdMapTest& operator=(const CastSessionIdMapTest&) = delete; + void SetUp() override { // Required for creating TestWebContents. gl::GLSurfaceTestSupport::InitializeOneOff(); @@ -39,9 +42,6 @@ class CastSessionIdMapTest : public content::RenderViewHostTestHarness { scoped_refptr task_runner_; std::unique_ptr initializer_; CastSessionIdMap* cast_session_id_map_; - - private: - DISALLOW_COPY_AND_ASSIGN(CastSessionIdMapTest); }; TEST_F(CastSessionIdMapTest, DefaultsToEmptyString) { diff --git a/chromecast/browser/cast_web_contents.h b/chromecast/browser/cast_web_contents.h index f8edba37f9cdb7..c79b720cd6db04 100644 --- a/chromecast/browser/cast_web_contents.h +++ b/chromecast/browser/cast_web_contents.h @@ -143,6 +143,10 @@ class CastWebContents : public mojom::CastWebContents { static CastWebContents* FromWebContents(content::WebContents* web_contents); CastWebContents(); + + CastWebContents(const CastWebContents&) = delete; + CastWebContents& operator=(const CastWebContents&) = delete; + ~CastWebContents() override; // Tab identifier for the WebContents, mainly used by the tabs extension API. @@ -281,8 +285,6 @@ class CastWebContents : public mojom::CastWebContents { // valid sequence, enforced via SequenceChecker. void AddObserver(Observer* observer); void RemoveObserver(Observer* observer); - - DISALLOW_COPY_AND_ASSIGN(CastWebContents); }; } // namespace chromecast diff --git a/chromecast/browser/cast_web_contents_browsertest.cc b/chromecast/browser/cast_web_contents_browsertest.cc index d3bdf572562df4..57c4032ef25d1e 100644 --- a/chromecast/browser/cast_web_contents_browsertest.cc +++ b/chromecast/browser/cast_web_contents_browsertest.cc @@ -235,6 +235,11 @@ class TestMessageReceiver : public blink::WebMessagePort::MessageReceiver { // ============================================================================= class CastWebContentsBrowserTest : public content::BrowserTestBase, public content::WebContentsObserver { + public: + CastWebContentsBrowserTest(const CastWebContentsBrowserTest&) = delete; + CastWebContentsBrowserTest& operator=(const CastWebContentsBrowserTest&) = + delete; + protected: CastWebContentsBrowserTest() = default; ~CastWebContentsBrowserTest() override = default; @@ -300,9 +305,6 @@ class CastWebContentsBrowserTest : public content::BrowserTestBase, std::unique_ptr run_loop_; base::flat_set render_frames_; - - private: - DISALLOW_COPY_AND_ASSIGN(CastWebContentsBrowserTest); }; MATCHER_P2(CheckPageState, cwc_ptr, expected_state, "") { diff --git a/chromecast/browser/devtools/remote_debugging_server.cc b/chromecast/browser/devtools/remote_debugging_server.cc index 34cbb7477fe91a..588359f2ba84ee 100644 --- a/chromecast/browser/devtools/remote_debugging_server.cc +++ b/chromecast/browser/devtools/remote_debugging_server.cc @@ -52,6 +52,10 @@ class UnixDomainServerSocketFactory : public content::DevToolsSocketFactory { explicit UnixDomainServerSocketFactory(const std::string& socket_name) : socket_name_(socket_name) {} + UnixDomainServerSocketFactory(const UnixDomainServerSocketFactory&) = delete; + UnixDomainServerSocketFactory& operator=( + const UnixDomainServerSocketFactory&) = delete; + private: // content::DevToolsSocketFactory. std::unique_ptr CreateForHttpServer() override { @@ -71,8 +75,6 @@ class UnixDomainServerSocketFactory : public content::DevToolsSocketFactory { } std::string socket_name_; - - DISALLOW_COPY_AND_ASSIGN(UnixDomainServerSocketFactory); }; #else class TCPServerSocketFactory : public content::DevToolsSocketFactory { @@ -80,6 +82,9 @@ class TCPServerSocketFactory : public content::DevToolsSocketFactory { explicit TCPServerSocketFactory(const net::IPEndPoint& endpoint) : endpoint_(endpoint) {} + TCPServerSocketFactory(const TCPServerSocketFactory&) = delete; + TCPServerSocketFactory& operator=(const TCPServerSocketFactory&) = delete; + private: // content::DevToolsSocketFactory. std::unique_ptr CreateForHttpServer() override { @@ -98,8 +103,6 @@ class TCPServerSocketFactory : public content::DevToolsSocketFactory { } const net::IPEndPoint endpoint_; - - DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory); }; #endif diff --git a/chromecast/browser/extensions/api/identity/identity_api.h b/chromecast/browser/extensions/api/identity/identity_api.h index 0208ddd46e2c0e..6c954a7952ad0e 100644 --- a/chromecast/browser/extensions/api/identity/identity_api.h +++ b/chromecast/browser/extensions/api/identity/identity_api.h @@ -20,14 +20,15 @@ class IdentityGetAuthTokenFunction : public ExtensionFunction { IdentityGetAuthTokenFunction(); + IdentityGetAuthTokenFunction(const IdentityGetAuthTokenFunction&) = delete; + IdentityGetAuthTokenFunction& operator=(const IdentityGetAuthTokenFunction&) = + delete; + protected: ~IdentityGetAuthTokenFunction() override; // ExtensionFunction: ResponseAction Run() override; - - private: - DISALLOW_COPY_AND_ASSIGN(IdentityGetAuthTokenFunction); }; // Stub. See the IDL file for documentation. @@ -37,14 +38,16 @@ class IdentityRemoveCachedAuthTokenFunction : public ExtensionFunction { IdentityRemoveCachedAuthTokenFunction(); + IdentityRemoveCachedAuthTokenFunction( + const IdentityRemoveCachedAuthTokenFunction&) = delete; + IdentityRemoveCachedAuthTokenFunction& operator=( + const IdentityRemoveCachedAuthTokenFunction&) = delete; + protected: ~IdentityRemoveCachedAuthTokenFunction() override; // ExtensionFunction: ResponseAction Run() override; - - private: - DISALLOW_COPY_AND_ASSIGN(IdentityRemoveCachedAuthTokenFunction); }; } // namespace cast diff --git a/chromecast/browser/extensions/api/settings_private/settings_private_api.h b/chromecast/browser/extensions/api/settings_private/settings_private_api.h index 4ac03c96897379..52e7a60dc9a265 100644 --- a/chromecast/browser/extensions/api/settings_private/settings_private_api.h +++ b/chromecast/browser/extensions/api/settings_private/settings_private_api.h @@ -15,6 +15,12 @@ namespace cast { class SettingsPrivateSetPrefFunction : public ExtensionFunction { public: SettingsPrivateSetPrefFunction() {} + + SettingsPrivateSetPrefFunction(const SettingsPrivateSetPrefFunction&) = + delete; + SettingsPrivateSetPrefFunction& operator=( + const SettingsPrivateSetPrefFunction&) = delete; + DECLARE_EXTENSION_FUNCTION("settingsPrivate.setPref", SETTINGSPRIVATE_SETPREF) protected: @@ -22,14 +28,18 @@ class SettingsPrivateSetPrefFunction : public ExtensionFunction { // ExtensionFunction overrides. ResponseAction Run() override; - - DISALLOW_COPY_AND_ASSIGN(SettingsPrivateSetPrefFunction); }; // Implements the chrome.settingsPrivate.getAllPrefs method. class SettingsPrivateGetAllPrefsFunction : public ExtensionFunction { public: SettingsPrivateGetAllPrefsFunction() {} + + SettingsPrivateGetAllPrefsFunction( + const SettingsPrivateGetAllPrefsFunction&) = delete; + SettingsPrivateGetAllPrefsFunction& operator=( + const SettingsPrivateGetAllPrefsFunction&) = delete; + DECLARE_EXTENSION_FUNCTION("settingsPrivate.getAllPrefs", SETTINGSPRIVATE_GETALLPREFS) @@ -38,14 +48,18 @@ class SettingsPrivateGetAllPrefsFunction : public ExtensionFunction { // ExtensionFunction overrides. ResponseAction Run() override; - - DISALLOW_COPY_AND_ASSIGN(SettingsPrivateGetAllPrefsFunction); }; // Implements the chrome.settingsPrivate.getPref method. class SettingsPrivateGetPrefFunction : public ExtensionFunction { public: SettingsPrivateGetPrefFunction() {} + + SettingsPrivateGetPrefFunction(const SettingsPrivateGetPrefFunction&) = + delete; + SettingsPrivateGetPrefFunction& operator=( + const SettingsPrivateGetPrefFunction&) = delete; + DECLARE_EXTENSION_FUNCTION("settingsPrivate.getPref", SETTINGSPRIVATE_GETPREF) protected: @@ -53,14 +67,18 @@ class SettingsPrivateGetPrefFunction : public ExtensionFunction { // ExtensionFunction overrides. ResponseAction Run() override; - - DISALLOW_COPY_AND_ASSIGN(SettingsPrivateGetPrefFunction); }; // Implements the chrome.settingsPrivate.getDefaultZoom method. class SettingsPrivateGetDefaultZoomFunction : public ExtensionFunction { public: SettingsPrivateGetDefaultZoomFunction() {} + + SettingsPrivateGetDefaultZoomFunction( + const SettingsPrivateGetDefaultZoomFunction&) = delete; + SettingsPrivateGetDefaultZoomFunction& operator=( + const SettingsPrivateGetDefaultZoomFunction&) = delete; + DECLARE_EXTENSION_FUNCTION("settingsPrivate.getDefaultZoom", SETTINGSPRIVATE_GETDEFAULTZOOMFUNCTION) @@ -69,14 +87,18 @@ class SettingsPrivateGetDefaultZoomFunction : public ExtensionFunction { // ExtensionFunction overrides. ResponseAction Run() override; - - DISALLOW_COPY_AND_ASSIGN(SettingsPrivateGetDefaultZoomFunction); }; // Implements the chrome.settingsPrivate.setDefaultZoom method. class SettingsPrivateSetDefaultZoomFunction : public ExtensionFunction { public: SettingsPrivateSetDefaultZoomFunction() {} + + SettingsPrivateSetDefaultZoomFunction( + const SettingsPrivateSetDefaultZoomFunction&) = delete; + SettingsPrivateSetDefaultZoomFunction& operator=( + const SettingsPrivateSetDefaultZoomFunction&) = delete; + DECLARE_EXTENSION_FUNCTION("settingsPrivate.setDefaultZoom", SETTINGSPRIVATE_SETDEFAULTZOOMFUNCTION) @@ -85,8 +107,6 @@ class SettingsPrivateSetDefaultZoomFunction : public ExtensionFunction { // ExtensionFunction overrides. ResponseAction Run() override; - - DISALLOW_COPY_AND_ASSIGN(SettingsPrivateSetDefaultZoomFunction); }; } // namespace cast diff --git a/chromecast/browser/extensions/api/tabs/tabs_api.h b/chromecast/browser/extensions/api/tabs/tabs_api.h index ac214479029d84..ccd3e845e1e0e0 100644 --- a/chromecast/browser/extensions/api/tabs/tabs_api.h +++ b/chromecast/browser/extensions/api/tabs/tabs_api.h @@ -167,6 +167,10 @@ class TabsCaptureVisibleTabFunction : public ExtensionFunction { public: TabsCaptureVisibleTabFunction(); + TabsCaptureVisibleTabFunction(const TabsCaptureVisibleTabFunction&) = delete; + TabsCaptureVisibleTabFunction& operator=( + const TabsCaptureVisibleTabFunction&) = delete; + // ExtensionFunction implementation. ResponseAction Run() override; @@ -175,8 +179,6 @@ class TabsCaptureVisibleTabFunction : public ExtensionFunction { private: DECLARE_EXTENSION_FUNCTION("tabs.captureVisibleTab", TABS_CAPTUREVISIBLETAB) - - DISALLOW_COPY_AND_ASSIGN(TabsCaptureVisibleTabFunction); }; // Implement API call tabs.executeScript and tabs.insertCSS. @@ -268,13 +270,14 @@ class TabsDiscardFunction : public ExtensionFunction { TabsDiscardFunction(); + TabsDiscardFunction(const TabsDiscardFunction&) = delete; + TabsDiscardFunction& operator=(const TabsDiscardFunction&) = delete; + private: ~TabsDiscardFunction() override; // ExtensionFunction: ExtensionFunction::ResponseAction Run() override; - - DISALLOW_COPY_AND_ASSIGN(TabsDiscardFunction); }; } // namespace api diff --git a/chromecast/browser/extensions/cast_extension_system_factory.h b/chromecast/browser/extensions/cast_extension_system_factory.h index 8af894df351518..901ee6db523bec 100644 --- a/chromecast/browser/extensions/cast_extension_system_factory.h +++ b/chromecast/browser/extensions/cast_extension_system_factory.h @@ -20,6 +20,10 @@ class CastExtensionSystemFactory : public ExtensionSystemProvider { static CastExtensionSystemFactory* GetInstance(); + CastExtensionSystemFactory(const CastExtensionSystemFactory&) = delete; + CastExtensionSystemFactory& operator=(const CastExtensionSystemFactory&) = + delete; + private: friend struct base::DefaultSingletonTraits; @@ -32,8 +36,6 @@ class CastExtensionSystemFactory : public ExtensionSystemProvider { content::BrowserContext* GetBrowserContextToUse( content::BrowserContext* context) const override; bool ServiceIsCreatedWithBrowserContext() const override; - - DISALLOW_COPY_AND_ASSIGN(CastExtensionSystemFactory); }; } // namespace extensions diff --git a/chromecast/browser/metrics/external_metrics.h b/chromecast/browser/metrics/external_metrics.h index bf0aae6aa13a13..4f0bd84de26d86 100644 --- a/chromecast/browser/metrics/external_metrics.h +++ b/chromecast/browser/metrics/external_metrics.h @@ -28,6 +28,10 @@ class ExternalMetrics { public: explicit ExternalMetrics(CastStabilityMetricsProvider* stability_provider, const std::string& uma_events_file); + + ExternalMetrics(const ExternalMetrics&) = delete; + ExternalMetrics& operator=(const ExternalMetrics&) = delete; + // Begins external data collection. Calls to RecordAction originate in the // File thread but are executed in the UI thread. void Start(); @@ -78,8 +82,6 @@ class ExternalMetrics { SEQUENCE_CHECKER(sequence_checker_); base::WeakPtrFactory weak_factory_; - - DISALLOW_COPY_AND_ASSIGN(ExternalMetrics); }; } // namespace metrics diff --git a/chromecast/browser/service_manager_connection.cc b/chromecast/browser/service_manager_connection.cc index d33968df26520e..e14e326ef499c9 100644 --- a/chromecast/browser/service_manager_connection.cc +++ b/chromecast/browser/service_manager_connection.cc @@ -54,6 +54,9 @@ class ServiceManagerConnection::IOThreadContext io_thread_checker_.DetachFromThread(); } + IOThreadContext(const IOThreadContext&) = delete; + IOThreadContext& operator=(const IOThreadContext&) = delete; + // Safe to call from any thread. void Start() { DCHECK(!started_); @@ -176,8 +179,6 @@ class ServiceManagerConnection::IOThreadContext MessageLoopObserver* message_loop_observer_ = nullptr; base::WeakPtrFactory weak_factory_{this}; - - DISALLOW_COPY_AND_ASSIGN(IOThreadContext); }; // static diff --git a/chromecast/browser/service_manager_context.cc b/chromecast/browser/service_manager_context.cc index 2873d0b3c78608..94b93586359b35 100644 --- a/chromecast/browser/service_manager_context.cc +++ b/chromecast/browser/service_manager_context.cc @@ -230,6 +230,11 @@ class ServiceManagerContext::InProcessServiceManagerContext : service_manager_thread_task_runner_( service_manager_thread_task_runner) {} + InProcessServiceManagerContext(const InProcessServiceManagerContext&) = + delete; + InProcessServiceManagerContext& operator=( + const InProcessServiceManagerContext&) = delete; + void Start(std::vector manifests, mojo::PendingRemote system_remote, ServiceRequestHandler request_handler) { @@ -294,8 +299,6 @@ class ServiceManagerContext::InProcessServiceManagerContext const scoped_refptr service_manager_thread_task_runner_; std::unique_ptr service_manager_; - - DISALLOW_COPY_AND_ASSIGN(InProcessServiceManagerContext); }; ServiceManagerContext::ServiceManagerContext( diff --git a/chromecast/browser/test/cast_browser_test.h b/chromecast/browser/test/cast_browser_test.h index b34aef4119ee57..3e494c85fc6cd5 100644 --- a/chromecast/browser/test/cast_browser_test.h +++ b/chromecast/browser/test/cast_browser_test.h @@ -30,6 +30,10 @@ namespace shell { // fewer test cases with more assertions are preferable. class CastBrowserTest : public content::BrowserTestBase, public CastWebView::Delegate { + public: + CastBrowserTest(const CastBrowserTest&) = delete; + CastBrowserTest& operator=(const CastBrowserTest&) = delete; + protected: CastBrowserTest(); ~CastBrowserTest() override; @@ -58,7 +62,6 @@ class CastBrowserTest : public content::BrowserTestBase, CastWebView::Scoped cast_web_view_; base::WeakPtrFactory weak_factory_{this}; - DISALLOW_COPY_AND_ASSIGN(CastBrowserTest); }; } // namespace shell diff --git a/chromecast/browser/test/cast_navigation_browsertest.cc b/chromecast/browser/test/cast_navigation_browsertest.cc index b4ea362cb8a4c1..0adcddbfa72dfc 100644 --- a/chromecast/browser/test/cast_navigation_browsertest.cc +++ b/chromecast/browser/test/cast_navigation_browsertest.cc @@ -28,6 +28,10 @@ class CastNavigationBrowserTest : public CastBrowserTest { public: CastNavigationBrowserTest() {} + CastNavigationBrowserTest(const CastNavigationBrowserTest&) = delete; + CastNavigationBrowserTest& operator=(const CastNavigationBrowserTest&) = + delete; + void SetUpOnMainThread() override { embedded_test_server()->ServeFilesFromSourceDirectory( ::media::GetTestDataPath()); @@ -85,8 +89,6 @@ class CastNavigationBrowserTest : public CastBrowserTest { title_watcher.AlsoWaitForTitle(kFailed); return title_watcher.WaitAndGetTitle(); } - - DISALLOW_COPY_AND_ASSIGN(CastNavigationBrowserTest); }; IN_PROC_BROWSER_TEST_F(CastNavigationBrowserTest, EmptyTest) { diff --git a/chromecast/browser/ui/aura/accessibility/automation_manager_aura.h b/chromecast/browser/ui/aura/accessibility/automation_manager_aura.h index 3ad34ea6aa8218..f3e838e29a2abf 100644 --- a/chromecast/browser/ui/aura/accessibility/automation_manager_aura.h +++ b/chromecast/browser/ui/aura/accessibility/automation_manager_aura.h @@ -44,6 +44,9 @@ class AutomationManagerAura : public ui::AXActionHandler, // Get the single instance of this class. static AutomationManagerAura* GetInstance(); + AutomationManagerAura(const AutomationManagerAura&) = delete; + AutomationManagerAura& operator=(const AutomationManagerAura&) = delete; + // Enable automation support for views. void Enable(); @@ -118,8 +121,6 @@ class AutomationManagerAura : public ui::AXActionHandler, std::unique_ptr alert_window_; views::AXAuraObjCache cache_; - - DISALLOW_COPY_AND_ASSIGN(AutomationManagerAura); }; #endif // CHROMECAST_BROWSER_UI_AURA_ACCESSIBILITY_AUTOMATION_MANAGER_AURA_H_ diff --git a/chromecast/browser/webview/js_channel_service.h b/chromecast/browser/webview/js_channel_service.h index f5cb20ee58eb9e..336c1e0989f9ff 100644 --- a/chromecast/browser/webview/js_channel_service.h +++ b/chromecast/browser/webview/js_channel_service.h @@ -59,6 +59,9 @@ class JsClientInstance { static JsClientInstance* Find(int process_id, int routing_id); + JsClientInstance(const JsClientInstance&) = delete; + JsClientInstance& operator=(const JsClientInstance&) = delete; + static void AddObserver(Observer* observer); static void RemoveObserver(Observer* observer); @@ -73,8 +76,6 @@ class JsClientInstance { mojo::Remote client_; mojo::UniqueReceiverSet channels_; - - DISALLOW_COPY_AND_ASSIGN(JsClientInstance); }; } // namespace chromecast diff --git a/chromecast/common/queryable_data.h b/chromecast/common/queryable_data.h index a8a4d847ecc0b1..5ecd19e29ee609 100644 --- a/chromecast/common/queryable_data.h +++ b/chromecast/common/queryable_data.h @@ -28,6 +28,9 @@ class QueryableData { public: using ValueMap = base::flat_map; + QueryableData(const QueryableData&) = delete; + QueryableData& operator=(const QueryableData&) = delete; + // Stores a value for the current process. If the key already exists, the // value is replaced. static void RegisterQueryableValue(const std::string& query_key, @@ -46,8 +49,6 @@ class QueryableData { SEQUENCE_CHECKER(sequence_checker_); ValueMap queryable_values_; - - DISALLOW_COPY_AND_ASSIGN(QueryableData); }; } // namespace chromecast diff --git a/chromecast/crash/linux/dummy_minidump_generator.h b/chromecast/crash/linux/dummy_minidump_generator.h index 5eabca8039bf70..f928db0b59ccfc 100644 --- a/chromecast/crash/linux/dummy_minidump_generator.h +++ b/chromecast/crash/linux/dummy_minidump_generator.h @@ -20,6 +20,9 @@ class DummyMinidumpGenerator : public MinidumpGenerator { // directly. explicit DummyMinidumpGenerator(const std::string& existing_minidump_path); + DummyMinidumpGenerator(const DummyMinidumpGenerator&) = delete; + DummyMinidumpGenerator& operator=(const DummyMinidumpGenerator&) = delete; + // MinidumpGenerator implementation: // Moves the minidump located at |existing_minidump_path_| to |minidump_path|. // Returns true if successful, false otherwise. Note that this function MUST @@ -28,8 +31,6 @@ class DummyMinidumpGenerator : public MinidumpGenerator { private: const std::string existing_minidump_path_; - - DISALLOW_COPY_AND_ASSIGN(DummyMinidumpGenerator); }; } // namespace chromecast diff --git a/chromecast/crash/linux/minidump_writer_unittest.cc b/chromecast/crash/linux/minidump_writer_unittest.cc index c509c498e651c7..483c300cb21eea 100644 --- a/chromecast/crash/linux/minidump_writer_unittest.cc +++ b/chromecast/crash/linux/minidump_writer_unittest.cc @@ -43,6 +43,10 @@ int FakeDumpState(const std::string& minidump_path) { } // namespace class MinidumpWriterTest : public testing::Test { + public: + MinidumpWriterTest(const MinidumpWriterTest&) = delete; + MinidumpWriterTest& operator=(const MinidumpWriterTest&) = delete; + protected: MinidumpWriterTest() {} ~MinidumpWriterTest() override {} @@ -78,8 +82,6 @@ class MinidumpWriterTest : public testing::Test { private: base::ScopedTempDir fake_home_dir_; std::unique_ptr home_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpWriterTest); }; TEST_F(MinidumpWriterTest, Write_FailsWithIncorrectMinidumpPath) { diff --git a/chromecast/device/bluetooth/le/le_scan_manager.h b/chromecast/device/bluetooth/le/le_scan_manager.h index 12c4fb0e34390e..17b9a585854ca7 100644 --- a/chromecast/device/bluetooth/le/le_scan_manager.h +++ b/chromecast/device/bluetooth/le/le_scan_manager.h @@ -60,6 +60,9 @@ class LeScanManager { BluetoothManagerPlatform* bluetooth_manager, bluetooth_v2_shlib::LeScannerImpl* le_scanner); + LeScanManager(const LeScanManager&) = delete; + LeScanManager& operator=(const LeScanManager&) = delete; + virtual ~LeScanManager() = default; virtual void Initialize( @@ -93,9 +96,6 @@ class LeScanManager { protected: LeScanManager() = default; - - private: - DISALLOW_COPY_AND_ASSIGN(LeScanManager); }; } // namespace bluetooth diff --git a/chromecast/device/bluetooth/le/le_scan_manager_impl_test.cc b/chromecast/device/bluetooth/le/le_scan_manager_impl_test.cc index 4317e161c45950..c38d0315237877 100644 --- a/chromecast/device/bluetooth/le/le_scan_manager_impl_test.cc +++ b/chromecast/device/bluetooth/le/le_scan_manager_impl_test.cc @@ -48,6 +48,10 @@ class MockLeScanManagerObserver : public LeScanManager::Observer { }; class LeScanManagerTest : public ::testing::Test { + public: + LeScanManagerTest(const LeScanManagerTest&) = delete; + LeScanManagerTest& operator=(const LeScanManagerTest&) = delete; + protected: LeScanManagerTest() : io_task_runner_(base::ThreadPool::CreateSingleThreadTaskRunner( @@ -71,9 +75,6 @@ class LeScanManagerTest : public ::testing::Test { bluetooth_v2_shlib::MockLeScanner le_scanner_; LeScanManagerImpl le_scan_manager_; MockLeScanManagerObserver mock_observer_; - - private: - DISALLOW_COPY_AND_ASSIGN(LeScanManagerTest); }; } // namespace diff --git a/chromecast/device/bluetooth/le/remote_characteristic.h b/chromecast/device/bluetooth/le/remote_characteristic.h index 3a133023597881..b3f205a67040c9 100644 --- a/chromecast/device/bluetooth/le/remote_characteristic.h +++ b/chromecast/device/bluetooth/le/remote_characteristic.h @@ -31,6 +31,9 @@ class RemoteCharacteristic base::OnceCallback&)>; using StatusCallback = base::OnceCallback; + RemoteCharacteristic(const RemoteCharacteristic&) = delete; + RemoteCharacteristic& operator=(const RemoteCharacteristic&) = delete; + // Return a list of all descriptors. virtual std::vector> GetDescriptors() = 0; @@ -89,9 +92,6 @@ class RemoteCharacteristic RemoteCharacteristic() = default; virtual ~RemoteCharacteristic() = default; - - private: - DISALLOW_COPY_AND_ASSIGN(RemoteCharacteristic); }; } // namespace bluetooth diff --git a/chromecast/device/bluetooth/le/remote_characteristic_impl.h b/chromecast/device/bluetooth/le/remote_characteristic_impl.h index 349c0653147e7e..9e49b57989f41f 100644 --- a/chromecast/device/bluetooth/le/remote_characteristic_impl.h +++ b/chromecast/device/bluetooth/le/remote_characteristic_impl.h @@ -26,6 +26,9 @@ class RemoteDeviceImpl; // specified, all callbacks are run on the caller's thread. class RemoteCharacteristicImpl : public RemoteCharacteristic { public: + RemoteCharacteristicImpl(const RemoteCharacteristicImpl&) = delete; + RemoteCharacteristicImpl& operator=(const RemoteCharacteristicImpl&) = delete; + // RemoteCharacteristic impl: std::vector> GetDescriptors() override; scoped_refptr GetDescriptorByUuid( @@ -92,8 +95,6 @@ class RemoteCharacteristicImpl : public RemoteCharacteristic { uuid_to_descriptor_; std::atomic notification_enabled_{false}; - - DISALLOW_COPY_AND_ASSIGN(RemoteCharacteristicImpl); }; } // namespace bluetooth diff --git a/chromecast/device/bluetooth/le/remote_descriptor.h b/chromecast/device/bluetooth/le/remote_descriptor.h index 0460998dbe757e..d67c8d0dd5e494 100644 --- a/chromecast/device/bluetooth/le/remote_descriptor.h +++ b/chromecast/device/bluetooth/le/remote_descriptor.h @@ -34,6 +34,9 @@ class RemoteDescriptor : public base::RefCountedThreadSafe { base::OnceCallback&)>; using StatusCallback = base::OnceCallback; + RemoteDescriptor(const RemoteDescriptor&) = delete; + RemoteDescriptor& operator=(const RemoteDescriptor&) = delete; + // Read the descriptor with |auth_req|. When completed, |callback| will be // called. virtual void ReadAuth(bluetooth_v2_shlib::Gatt::Client::AuthReq auth_req, @@ -62,9 +65,6 @@ class RemoteDescriptor : public base::RefCountedThreadSafe { RemoteDescriptor() = default; virtual ~RemoteDescriptor() = default; - - private: - DISALLOW_COPY_AND_ASSIGN(RemoteDescriptor); }; } // namespace bluetooth diff --git a/chromecast/device/bluetooth/le/remote_descriptor_impl.h b/chromecast/device/bluetooth/le/remote_descriptor_impl.h index 3dd060cb27d710..eb4419ffde1c69 100644 --- a/chromecast/device/bluetooth/le/remote_descriptor_impl.h +++ b/chromecast/device/bluetooth/le/remote_descriptor_impl.h @@ -21,6 +21,9 @@ class RemoteDeviceImpl; class RemoteDescriptorImpl : public RemoteDescriptor { public: + RemoteDescriptorImpl(const RemoteDescriptorImpl&) = delete; + RemoteDescriptorImpl& operator=(const RemoteDescriptorImpl&) = delete; + // RemoteDescriptor implementation: void ReadAuth(bluetooth_v2_shlib::Gatt::Client::AuthReq auth_req, ReadCallback callback) override; @@ -58,8 +61,6 @@ class RemoteDescriptorImpl : public RemoteDescriptor { // All bluetooth_v2_shlib calls are run on this task_runner. All members must // be accessed on this task_runner. const scoped_refptr io_task_runner_; - - DISALLOW_COPY_AND_ASSIGN(RemoteDescriptorImpl); }; } // namespace bluetooth diff --git a/chromecast/device/bluetooth/le/remote_device.h b/chromecast/device/bluetooth/le/remote_device.h index bdbc9a928ce9c1..3ab50b85463fc4 100644 --- a/chromecast/device/bluetooth/le/remote_device.h +++ b/chromecast/device/bluetooth/le/remote_device.h @@ -35,6 +35,9 @@ class RemoteDevice : public base::RefCountedThreadSafe { using StatusCallback = base::OnceCallback; using ConnectCallback = base::OnceCallback; + RemoteDevice(const RemoteDevice&) = delete; + RemoteDevice& operator=(const RemoteDevice&) = delete; + // Initiate a connection to this device. Callback will return |true| if // connected successfully, otherwise false. Only one pending call is allowed // at a time. @@ -106,9 +109,6 @@ class RemoteDevice : public base::RefCountedThreadSafe { RemoteDevice() = default; virtual ~RemoteDevice() = default; - - private: - DISALLOW_COPY_AND_ASSIGN(RemoteDevice); }; } // namespace bluetooth diff --git a/chromecast/device/bluetooth/le/remote_device_impl.h b/chromecast/device/bluetooth/le/remote_device_impl.h index fd204fa79c872b..d56ae8dd79d84a 100644 --- a/chromecast/device/bluetooth/le/remote_device_impl.h +++ b/chromecast/device/bluetooth/le/remote_device_impl.h @@ -37,6 +37,9 @@ class RemoteDeviceImpl : public RemoteDevice { // device. static constexpr base::TimeDelta kCommandTimeout = base::Seconds(30); + RemoteDeviceImpl(const RemoteDeviceImpl&) = delete; + RemoteDeviceImpl& operator=(const RemoteDeviceImpl&) = delete; + // RemoteDevice implementation void Connect(ConnectCallback cb, bluetooth_v2_shlib::Gatt::Client::Transport transport) override; void Disconnect(StatusCallback cb) override; @@ -190,8 +193,6 @@ class RemoteDeviceImpl : public RemoteDevice { handle_to_descriptor_read_cbs_; std::map> handle_to_descriptor_write_cbs_; - - DISALLOW_COPY_AND_ASSIGN(RemoteDeviceImpl); }; } // namespace bluetooth diff --git a/chromecast/device/bluetooth/le/remote_service.h b/chromecast/device/bluetooth/le/remote_service.h index 73afdf7b90bd15..0f0a4e09431fa0 100644 --- a/chromecast/device/bluetooth/le/remote_service.h +++ b/chromecast/device/bluetooth/le/remote_service.h @@ -25,6 +25,9 @@ class RemoteDevice; // specified, all callbacks are run on the caller's thread. class RemoteService : public base::RefCountedThreadSafe { public: + RemoteService(const RemoteService&) = delete; + RemoteService& operator=(const RemoteService&) = delete; + // Returns a list of characteristics in this service. virtual std::vector> GetCharacteristics() = 0; @@ -41,9 +44,6 @@ class RemoteService : public base::RefCountedThreadSafe { RemoteService() = default; virtual ~RemoteService() = default; - - private: - DISALLOW_COPY_AND_ASSIGN(RemoteService); }; } // namespace bluetooth diff --git a/chromecast/device/bluetooth/le/remote_service_impl.h b/chromecast/device/bluetooth/le/remote_service_impl.h index b43275d5ce6bba..5f4032099338fe 100644 --- a/chromecast/device/bluetooth/le/remote_service_impl.h +++ b/chromecast/device/bluetooth/le/remote_service_impl.h @@ -23,6 +23,9 @@ class RemoteDeviceImpl; class RemoteServiceImpl : public RemoteService { public: + RemoteServiceImpl(const RemoteServiceImpl&) = delete; + RemoteServiceImpl& operator=(const RemoteServiceImpl&) = delete; + // RemoteService implementation: std::vector> GetCharacteristics() override; @@ -55,8 +58,6 @@ class RemoteServiceImpl : public RemoteService { const std::map> uuid_to_characteristic_; - - DISALLOW_COPY_AND_ASSIGN(RemoteServiceImpl); }; } // namespace bluetooth diff --git a/chromecast/external_mojo/public/cpp/external_mojo_broker.cc b/chromecast/external_mojo/public/cpp/external_mojo_broker.cc index 9e51d9f8255817..39ee8059cc3713 100644 --- a/chromecast/external_mojo/public/cpp/external_mojo_broker.cc +++ b/chromecast/external_mojo/public/cpp/external_mojo_broker.cc @@ -73,6 +73,9 @@ class ExternalMojoBroker::ConnectorImpl : public mojom::ExternalConnector { public: ConnectorImpl() : connector_facade_(this) {} + ConnectorImpl(const ConnectorImpl&) = delete; + ConnectorImpl& operator=(const ConnectorImpl&) = delete; + void InitializeChromium( std::unique_ptr connector, const std::vector& external_services_to_proxy) { @@ -98,6 +101,9 @@ class ExternalMojoBroker::ConnectorImpl : public mojom::ExternalConnector { DCHECK(connector_); } + ExternalServiceProxy(const ExternalServiceProxy&) = delete; + ExternalServiceProxy& operator=(const ExternalServiceProxy&) = delete; + private: void OnBindInterface( const service_manager::BindSourceInfo& source, @@ -110,8 +116,6 @@ class ExternalMojoBroker::ConnectorImpl : public mojom::ExternalConnector { ConnectorImpl* const connector_; const std::string service_name_; service_manager::ServiceReceiver service_receiver_; - - DISALLOW_COPY_AND_ASSIGN(ExternalServiceProxy); }; class ServiceManagerConnectorFacade @@ -363,8 +367,6 @@ class ExternalMojoBroker::ConnectorImpl : public mojom::ExternalConnector { std::map> services_; std::map> pending_bind_requests_; std::map services_info_; - - DISALLOW_COPY_AND_ASSIGN(ConnectorImpl); }; class ExternalMojoBroker::ReadWatcher @@ -380,6 +382,9 @@ class ExternalMojoBroker::ReadWatcher base::MessagePumpForIO::WATCH_READ, &watch_controller_, this); } + ReadWatcher(const ReadWatcher&) = delete; + ReadWatcher& operator=(const ReadWatcher&) = delete; + // base::MessagePumpForIO::FdWatcher implementation: void OnFileCanReadWithoutBlocking(int fd) override { base::ScopedFD accepted_fd; @@ -403,8 +408,6 @@ class ExternalMojoBroker::ReadWatcher ConnectorImpl* const connector_; const mojo::PlatformHandle listen_handle_; base::MessagePumpForIO::FdWatchController watch_controller_; - - DISALLOW_COPY_AND_ASSIGN(ReadWatcher); }; ExternalMojoBroker::ExternalMojoBroker(const std::string& broker_path) { diff --git a/chromecast/graphics/accessibility/partial_magnification_controller_unittest.cc b/chromecast/graphics/accessibility/partial_magnification_controller_unittest.cc index 992ea630d5698d..1a8f2dddc36828 100644 --- a/chromecast/graphics/accessibility/partial_magnification_controller_unittest.cc +++ b/chromecast/graphics/accessibility/partial_magnification_controller_unittest.cc @@ -38,6 +38,10 @@ class PartialMagnificationControllerTestApi { explicit PartialMagnificationControllerTestApi( PartialMagnificationController* controller) : controller_(controller) {} + + PartialMagnificationControllerTestApi& operator=( + const PartialMagnificationControllerTestApi&) = delete; + ~PartialMagnificationControllerTestApi() = default; bool is_enabled() const { return controller_->is_enabled_; } @@ -51,8 +55,6 @@ class PartialMagnificationControllerTestApi { private: PartialMagnificationController* controller_; - - DISALLOW_ASSIGN(PartialMagnificationControllerTestApi); }; class PartialMagnificationControllerTest : public views::ViewsTestBase { diff --git a/chromecast/graphics/cast_focus_client_aura_test.cc b/chromecast/graphics/cast_focus_client_aura_test.cc index ffd8d78a95a6b0..851529f2a0667c 100644 --- a/chromecast/graphics/cast_focus_client_aura_test.cc +++ b/chromecast/graphics/cast_focus_client_aura_test.cc @@ -22,14 +22,15 @@ class TestWindow { window_.Show(); } + TestWindow(const TestWindow&) = delete; + TestWindow& operator=(const TestWindow&) = delete; + aura::test::TestWindowDelegate* delegate() { return &delegate_; } aura::Window* window() { return &window_; } private: aura::test::TestWindowDelegate delegate_; aura::Window window_; - - DISALLOW_COPY_AND_ASSIGN(TestWindow); }; } // namespace diff --git a/chromecast/graphics/cast_window_manager_aura_test.cc b/chromecast/graphics/cast_window_manager_aura_test.cc index 9e27123b09e38f..0aa6d554db9f76 100644 --- a/chromecast/graphics/cast_window_manager_aura_test.cc +++ b/chromecast/graphics/cast_window_manager_aura_test.cc @@ -46,13 +46,14 @@ class TestWindow { window_.SetBounds(gfx::Rect(0, 0, 1280, 720)); } + TestWindow(const TestWindow&) = delete; + TestWindow& operator=(const TestWindow&) = delete; + aura::Window* window() { return &window_; } private: CastTestWindowDelegate delegate_; aura::Window window_; - - DISALLOW_COPY_AND_ASSIGN(TestWindow); }; } // namespace diff --git a/chromecast/graphics/osd_plane_default.cc b/chromecast/graphics/osd_plane_default.cc index 823fb1d21465f7..c2f7d286e56710 100644 --- a/chromecast/graphics/osd_plane_default.cc +++ b/chromecast/graphics/osd_plane_default.cc @@ -18,6 +18,9 @@ class OsdSurfaceDefault : public OsdSurface { public: OsdSurfaceDefault(const Size& size) : size_(size) {} + OsdSurfaceDefault(const OsdSurfaceDefault&) = delete; + OsdSurfaceDefault& operator=(const OsdSurfaceDefault&) = delete; + // OsdSurface implementation: void Blit(OsdSurface* src_surface, const Rect& src_rect, @@ -35,8 +38,6 @@ class OsdSurfaceDefault : public OsdSurface { private: const Size size_; - - DISALLOW_COPY_AND_ASSIGN(OsdSurfaceDefault); }; // Default no-op OsdPlane implementation @@ -44,6 +45,9 @@ class OsdPlaneDefault : public OsdPlane { public: OsdPlaneDefault() : size_(0, 0) {} + OsdPlaneDefault(const OsdPlaneDefault&) = delete; + OsdPlaneDefault& operator=(const OsdPlaneDefault&) = delete; + // OsdPlane implementation: OsdSurface* CreateSurface(const Size& size) override { return new OsdSurfaceDefault(size); @@ -64,8 +68,6 @@ class OsdPlaneDefault : public OsdPlane { private: std::unique_ptr back_buffer_; Size size_; - - DISALLOW_COPY_AND_ASSIGN(OsdPlaneDefault); }; } // namespace diff --git a/chromecast/graphics/run_all_unittests.cc b/chromecast/graphics/run_all_unittests.cc index a5a36ac5fa0421..14b6dcd78310e8 100644 --- a/chromecast/graphics/run_all_unittests.cc +++ b/chromecast/graphics/run_all_unittests.cc @@ -16,6 +16,10 @@ class ChromecastGraphicsTestSuite : public base::TestSuite { ChromecastGraphicsTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} + ChromecastGraphicsTestSuite(const ChromecastGraphicsTestSuite&) = delete; + ChromecastGraphicsTestSuite& operator=(const ChromecastGraphicsTestSuite&) = + delete; + protected: void Initialize() override { base::TestSuite::Initialize(); @@ -31,7 +35,6 @@ class ChromecastGraphicsTestSuite : public base::TestSuite { private: std::unique_ptr env_; - DISALLOW_COPY_AND_ASSIGN(ChromecastGraphicsTestSuite); }; int main(int argc, char** argv) { diff --git a/chromecast/media/audio/audio_fader_unittest.cc b/chromecast/media/audio/audio_fader_unittest.cc index 07c1aaac2273cf..ac97e6483c702d 100644 --- a/chromecast/media/audio/audio_fader_unittest.cc +++ b/chromecast/media/audio/audio_fader_unittest.cc @@ -41,6 +41,9 @@ class TestFaderSource : public AudioProvider { last_requested_frames_(0), last_filled_frames_(0) {} + TestFaderSource(const TestFaderSource&) = delete; + TestFaderSource& operator=(const TestFaderSource&) = delete; + // AudioProvider implementation: int FillFrames(int num_frames, int64_t playout_timestamp, @@ -71,8 +74,6 @@ class TestFaderSource : public AudioProvider { int total_requested_frames_; int last_requested_frames_; int last_filled_frames_; - - DISALLOW_COPY_AND_ASSIGN(TestFaderSource); }; } // namespace diff --git a/chromecast/media/audio/fake_external_audio_pipeline.cc b/chromecast/media/audio/fake_external_audio_pipeline.cc index 67dd6f7fe10f2a..4110eb7bc05d60 100644 --- a/chromecast/media/audio/fake_external_audio_pipeline.cc +++ b/chromecast/media/audio/fake_external_audio_pipeline.cc @@ -24,6 +24,10 @@ namespace { class TestMediaVolumeMute { public: TestMediaVolumeMute() = default; + + TestMediaVolumeMute(const TestMediaVolumeMute&) = delete; + TestMediaVolumeMute& operator=(const TestMediaVolumeMute&) = delete; + // Called by library. void AddExternalMediaVolumeChangeRequestObserver( ExternalAudioPipelineShlib::ExternalMediaVolumeChangeRequestObserver* @@ -45,9 +49,6 @@ class TestMediaVolumeMute { volume_change_request_observer_ = nullptr; float volume_ = 0; bool muted_ = false; - - private: - DISALLOW_COPY_AND_ASSIGN(TestMediaVolumeMute); }; // Library implementation for loopback data testing part. It stores @@ -55,6 +56,10 @@ class TestMediaVolumeMute { class TestLoopBack { public: TestLoopBack() = default; + + TestLoopBack(const TestLoopBack&) = delete; + TestLoopBack& operator=(const TestLoopBack&) = delete; + // Called from FakeMixerOutputStream. void OnData(const float* data, int data_size, @@ -88,15 +93,15 @@ class TestLoopBack { protected: // Used by derived class for FakeExternalAudioPipelineSupport. std::vector observers_; - - private: - DISALLOW_COPY_AND_ASSIGN(TestLoopBack); }; class TestMediaMetadata { public: TestMediaMetadata() = default; + TestMediaMetadata(const TestMediaMetadata&) = delete; + TestMediaMetadata& operator=(const TestMediaMetadata&) = delete; + // Called from library. void AddExternalMediaMetadataChangeObserver( ExternalAudioPipelineShlib::ExternalMediaMetadataChangeObserver* @@ -111,7 +116,6 @@ class TestMediaMetadata { protected: ExternalAudioPipelineShlib::ExternalMediaMetadataChangeObserver* media_metadata_change_observer_ = nullptr; - DISALLOW_COPY_AND_ASSIGN(TestMediaMetadata); }; // Final class includes library implementation for testing media volume/mute @@ -123,6 +127,9 @@ class TestMedia : public TestMediaVolumeMute, public: TestMedia() = default; + TestMedia(const TestMedia&) = delete; + TestMedia& operator=(const TestMedia&) = delete; + bool supported() const { return supported_; } // FakeExternalAudioPipelineSupport implementation: @@ -158,8 +165,6 @@ class TestMedia : public TestMediaVolumeMute, private: bool supported_ = false; - - DISALLOW_COPY_AND_ASSIGN(TestMedia); }; TestMedia* GetTestMedia() { @@ -173,6 +178,9 @@ class FakeMixerOutputStream : public MixerOutputStream { public: FakeMixerOutputStream() : test_loop_back_(GetTestMedia()) {} + FakeMixerOutputStream(const FakeMixerOutputStream&) = delete; + FakeMixerOutputStream& operator=(const FakeMixerOutputStream&) = delete; + // MixerOutputStream implementation: bool Start(int requested_sample_rate, int channels) override { sample_rate_ = requested_sample_rate; @@ -206,8 +214,6 @@ class FakeMixerOutputStream : public MixerOutputStream { int sample_rate_ = 0; int channels_ = 0; TestLoopBack* const test_loop_back_; - - DISALLOW_COPY_AND_ASSIGN(FakeMixerOutputStream); }; } // namespace diff --git a/chromecast/media/audio/mixer_service/loopback_connection.h b/chromecast/media/audio/mixer_service/loopback_connection.h index a83151a487a560..db40593a4c5a9b 100644 --- a/chromecast/media/audio/mixer_service/loopback_connection.h +++ b/chromecast/media/audio/mixer_service/loopback_connection.h @@ -53,6 +53,10 @@ class LoopbackConnection : public MixerConnection, // For testing only. LoopbackConnection(Delegate* delegate, std::unique_ptr connected_socket_for_test); + + LoopbackConnection(const LoopbackConnection&) = delete; + LoopbackConnection& operator=(const LoopbackConnection&) = delete; + ~LoopbackConnection() override; // Initiates connection to the mixer service. Delegate methods can be called @@ -75,8 +79,6 @@ class LoopbackConnection : public MixerConnection, media::SampleFormat format_ = kUnknownSampleFormat; int sample_rate_ = 0; int num_channels_ = 0; - - DISALLOW_COPY_AND_ASSIGN(LoopbackConnection); }; } // namespace mixer_service diff --git a/chromecast/media/audio/mixer_service/mixer_control.h b/chromecast/media/audio/mixer_service/mixer_control.h index c9d16a289126d7..08389e974425bc 100644 --- a/chromecast/media/audio/mixer_service/mixer_control.h +++ b/chromecast/media/audio/mixer_service/mixer_control.h @@ -26,6 +26,9 @@ class MixerControl { // mixer is not present on this system. static MixerControl* Get(); + MixerControl(const MixerControl&) = delete; + MixerControl& operator=(const MixerControl&) = delete; + // Sends arbitrary config data to a specific postprocessor. void ConfigurePostprocessor(std::string postprocessor_name, std::string config); @@ -48,8 +51,6 @@ class MixerControl { ~MixerControl(); base::SequenceBound control_; - - DISALLOW_COPY_AND_ASSIGN(MixerControl); }; } // namespace mixer_service diff --git a/chromecast/media/audio/mixer_service/output_stream_connection.h b/chromecast/media/audio/mixer_service/output_stream_connection.h index 0174cb4d6d2661..3452d0d9d63a98 100644 --- a/chromecast/media/audio/mixer_service/output_stream_connection.h +++ b/chromecast/media/audio/mixer_service/output_stream_connection.h @@ -69,6 +69,10 @@ class OutputStreamConnection : public MixerConnection, }; OutputStreamConnection(Delegate* delegate, const OutputStreamParams& params); + + OutputStreamConnection(const OutputStreamConnection&) = delete; + OutputStreamConnection& operator=(const OutputStreamConnection&) = delete; + ~OutputStreamConnection() override; // Connects to the mixer. After this is called, delegate methods may start @@ -145,8 +149,6 @@ class OutputStreamConnection : public MixerConnection, bool sent_eos_ = false; bool dropping_audio_ = false; - - DISALLOW_COPY_AND_ASSIGN(OutputStreamConnection); }; } // namespace mixer_service diff --git a/chromecast/media/audio/mixer_service/receiver/cma_backend_shim.h b/chromecast/media/audio/mixer_service/receiver/cma_backend_shim.h index b10d084104fa9b..ea844b916c5fb9 100644 --- a/chromecast/media/audio/mixer_service/receiver/cma_backend_shim.h +++ b/chromecast/media/audio/mixer_service/receiver/cma_backend_shim.h @@ -69,6 +69,9 @@ class CmaBackendShim : public CmaBackend::AudioDecoder::Delegate { const OutputStreamParams& params, MediaPipelineBackendManager* backend_manager); + CmaBackendShim(const CmaBackendShim&) = delete; + CmaBackendShim& operator=(const CmaBackendShim&) = delete; + // Removes this audio output. Public methods must not be called after Remove() // is called. void Remove(); @@ -112,8 +115,6 @@ class CmaBackendShim : public CmaBackend::AudioDecoder::Delegate { std::unique_ptr cma_backend_; CmaBackend::AudioDecoder* audio_decoder_; - - DISALLOW_COPY_AND_ASSIGN(CmaBackendShim); }; } // namespace mixer_service diff --git a/chromecast/media/audio/mixer_service/receiver/receiver.cc b/chromecast/media/audio/mixer_service/receiver/receiver.cc index db97f44008a83e..24e7d6692a510d 100644 --- a/chromecast/media/audio/mixer_service/receiver/receiver.cc +++ b/chromecast/media/audio/mixer_service/receiver/receiver.cc @@ -42,6 +42,9 @@ class LocalReceiverInstance { public: LocalReceiverInstance() = default; + LocalReceiverInstance(const LocalReceiverInstance&) = delete; + LocalReceiverInstance& operator=(const LocalReceiverInstance&) = delete; + void SetInstance(Receiver* receiver) { base::AutoLock lock(lock_); receiver_ = receiver; @@ -63,8 +66,6 @@ class LocalReceiverInstance { } private: - DISALLOW_COPY_AND_ASSIGN(LocalReceiverInstance); - base::Lock lock_; Receiver* receiver_ = nullptr; }; diff --git a/chromecast/media/audio/mixer_service/redirected_audio_connection.h b/chromecast/media/audio/mixer_service/redirected_audio_connection.h index 79ebc04a495fc7..4aa0153661c065 100644 --- a/chromecast/media/audio/mixer_service/redirected_audio_connection.h +++ b/chromecast/media/audio/mixer_service/redirected_audio_connection.h @@ -77,6 +77,11 @@ class RedirectedAudioConnection : public MixerConnection, }; RedirectedAudioConnection(const Config& config, Delegate* delegate); + + RedirectedAudioConnection(const RedirectedAudioConnection&) = delete; + RedirectedAudioConnection& operator=(const RedirectedAudioConnection&) = + delete; + ~RedirectedAudioConnection() override; // Sets the patterns which determine which audio streams should be redirected. @@ -106,8 +111,6 @@ class RedirectedAudioConnection : public MixerConnection, std::unique_ptr socket_; int sample_rate_ = 0; - - DISALLOW_COPY_AND_ASSIGN(RedirectedAudioConnection); }; } // namespace mixer_service diff --git a/chromecast/media/base/slew_volume_unittests.cc b/chromecast/media/base/slew_volume_unittests.cc index 71dc8c78333f2b..e5a492bd795032 100644 --- a/chromecast/media/base/slew_volume_unittests.cc +++ b/chromecast/media/base/slew_volume_unittests.cc @@ -80,6 +80,10 @@ void CompareDataPartial(const std::vector& expected, } // namespace class SlewVolumeBaseTest : public ::testing::Test { + public: + SlewVolumeBaseTest(const SlewVolumeBaseTest&) = delete; + SlewVolumeBaseTest& operator=(const SlewVolumeBaseTest&) = delete; + protected: SlewVolumeBaseTest() = default; ~SlewVolumeBaseTest() override = default; @@ -126,9 +130,6 @@ class SlewVolumeBaseTest : public ::testing::Test { std::vector data_; std::vector data_2_; std::vector expected_; - - private: - DISALLOW_COPY_AND_ASSIGN(SlewVolumeBaseTest); }; // ASSERT_DEATH isn't implemented on Fuchsia. @@ -187,6 +188,11 @@ TEST_F(SlewVolumeBaseTest, InstantVolumeIncreasing) { } class SlewVolumeSteadyStateTest : public SlewVolumeBaseTest { + public: + SlewVolumeSteadyStateTest(const SlewVolumeSteadyStateTest&) = delete; + SlewVolumeSteadyStateTest& operator=(const SlewVolumeSteadyStateTest&) = + delete; + protected: SlewVolumeSteadyStateTest() = default; ~SlewVolumeSteadyStateTest() override = default; @@ -195,9 +201,6 @@ class SlewVolumeSteadyStateTest : public SlewVolumeBaseTest { SlewVolumeBaseTest::SetUp(); slew_volume_->Interrupted(); } - - private: - DISALLOW_COPY_AND_ASSIGN(SlewVolumeSteadyStateTest); }; TEST_F(SlewVolumeSteadyStateTest, FMULNoOp) { @@ -253,6 +256,10 @@ TEST_F(SlewVolumeSteadyStateTest, FMACNoOp) { class SlewVolumeDynamicTest : public SlewVolumeBaseTest, public ::testing::WithParamInterface> { + public: + SlewVolumeDynamicTest(const SlewVolumeDynamicTest&) = delete; + SlewVolumeDynamicTest& operator=(const SlewVolumeDynamicTest&) = delete; + protected: SlewVolumeDynamicTest() = default; ~SlewVolumeDynamicTest() override = default; @@ -339,9 +346,6 @@ class SlewVolumeDynamicTest int slew_time_frames_; int channels_; int max_frame_; - - private: - DISALLOW_COPY_AND_ASSIGN(SlewVolumeDynamicTest); }; TEST_P(SlewVolumeDynamicTest, FMULRampUp) { @@ -446,6 +450,11 @@ INSTANTIATE_TEST_SUITE_P(SingleBufferSlew, ::testing::Values(0, 15, 100))); class SlewVolumeInterleavedTest : public SlewVolumeDynamicTest { + public: + SlewVolumeInterleavedTest(const SlewVolumeInterleavedTest&) = delete; + SlewVolumeInterleavedTest& operator=(const SlewVolumeInterleavedTest&) = + delete; + protected: SlewVolumeInterleavedTest() = default; ~SlewVolumeInterleavedTest() override = default; @@ -476,9 +485,6 @@ class SlewVolumeInterleavedTest : public SlewVolumeDynamicTest { float Expected(int channel, int frame) override { return expected_[0][channels_ * frame + channel]; } - - private: - DISALLOW_COPY_AND_ASSIGN(SlewVolumeInterleavedTest); }; TEST_P(SlewVolumeInterleavedTest, FMACRampDown) { diff --git a/chromecast/media/base/video_plane_controller.cc b/chromecast/media/base/video_plane_controller.cc index 17c83adee3e688..bb49fba639c14c 100644 --- a/chromecast/media/base/video_plane_controller.cc +++ b/chromecast/media/base/video_plane_controller.cc @@ -84,6 +84,11 @@ class VideoPlaneController::RateLimitedSetVideoPlaneGeometry sample_counter_(0), task_runner_(task_runner) {} + RateLimitedSetVideoPlaneGeometry(const RateLimitedSetVideoPlaneGeometry&) = + delete; + RateLimitedSetVideoPlaneGeometry& operator=( + const RateLimitedSetVideoPlaneGeometry&) = delete; + void SetGeometry(const chromecast::RectF& display_rect, VideoPlane::Transform transform) { DCHECK(task_runner_->BelongsToCurrentThread()); @@ -160,8 +165,6 @@ class VideoPlaneController::RateLimitedSetVideoPlaneGeometry size_t sample_counter_; scoped_refptr task_runner_; - - DISALLOW_COPY_AND_ASSIGN(RateLimitedSetVideoPlaneGeometry); }; VideoPlaneController::VideoPlaneController( diff --git a/chromecast/media/cdm/cast_cdm.h b/chromecast/media/cdm/cast_cdm.h index 7debfde3ffcf74..8d0eed3b28f53f 100644 --- a/chromecast/media/cdm/cast_cdm.h +++ b/chromecast/media/cdm/cast_cdm.h @@ -39,6 +39,9 @@ class CastCdm : public ::media::ContentDecryptionModule { public: explicit CastCdm(MediaResourceTracker* media_resource_tracker); + CastCdm(const CastCdm&) = delete; + CastCdm& operator=(const CastCdm&) = delete; + void Initialize( const ::media::SessionMessageCB& session_message_cb, const ::media::SessionClosedCB& session_closed_cb, @@ -109,8 +112,6 @@ class CastCdm : public ::media::ContentDecryptionModule { event_callbacks_; base::ThreadChecker thread_checker_; - - DISALLOW_COPY_AND_ASSIGN(CastCdm); }; } // namespace media diff --git a/chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h b/chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h index 572b8d058da1a1..dd20e6a061eebc 100644 --- a/chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h +++ b/chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h @@ -41,6 +41,11 @@ class AudioSinkAndroidAudioTrackImpl : public AudioSinkAndroid { // buffer larger than this size and feed it in in smaller chunks. static const int kDirectBufferSize = 512 * 1024; + AudioSinkAndroidAudioTrackImpl(const AudioSinkAndroidAudioTrackImpl&) = + delete; + AudioSinkAndroidAudioTrackImpl& operator=( + const AudioSinkAndroidAudioTrackImpl&) = delete; + // Gets the Android audio session ids used for media and communication (TTS) // tracks. // Set a return value pointer to null if that id is not needed. @@ -157,8 +162,6 @@ class AudioSinkAndroidAudioTrackImpl : public AudioSinkAndroid { base::WeakPtr weak_this_; base::WeakPtrFactory weak_factory_; - - DISALLOW_COPY_AND_ASSIGN(AudioSinkAndroidAudioTrackImpl); }; } // namespace media diff --git a/chromecast/media/cma/backend/android/audio_sink_manager.h b/chromecast/media/cma/backend/android/audio_sink_manager.h index 744ca6eaf9c018..cd8a12e1432892 100644 --- a/chromecast/media/cma/backend/android/audio_sink_manager.h +++ b/chromecast/media/cma/backend/android/audio_sink_manager.h @@ -20,6 +20,10 @@ namespace media { class AudioSinkManager { public: static AudioSinkManager* Get(); + + AudioSinkManager(const AudioSinkManager&) = delete; + AudioSinkManager& operator=(const AudioSinkManager&) = delete; + static AudioSinkAndroid::SinkType GetDefaultSinkType(); // Gets the Android audio session ids used for media and communication (TTS) @@ -69,8 +73,6 @@ class AudioSinkManager { std::map volume_info_; std::vector sinks_; - - DISALLOW_COPY_AND_ASSIGN(AudioSinkManager); }; } // namespace media diff --git a/chromecast/media/cma/backend/mixer/filter_group_unittest.cc b/chromecast/media/cma/backend/mixer/filter_group_unittest.cc index 9a6064e25684d3..4cf098b2da6cdc 100644 --- a/chromecast/media/cma/backend/mixer/filter_group_unittest.cc +++ b/chromecast/media/cma/backend/mixer/filter_group_unittest.cc @@ -166,6 +166,10 @@ std::unique_ptr<::media::AudioBus> GetTestData() { } class FilterGroupTest : public testing::Test { + public: + FilterGroupTest(const FilterGroupTest&) = delete; + FilterGroupTest& operator=(const FilterGroupTest&) = delete; + protected: using RenderingDelay = MixerInput::RenderingDelay; FilterGroupTest() : source_(kInputSampleRate) { @@ -215,9 +219,6 @@ class FilterGroupTest : public testing::Test { std::unique_ptr filter_group_; std::unique_ptr input_; MockPostProcessingPipeline* post_processor_ = nullptr; - - private: - DISALLOW_COPY_AND_ASSIGN(FilterGroupTest); }; TEST_F(FilterGroupTest, Passthrough) { diff --git a/chromecast/media/cma/backend/mixer/loopback_handler.cc b/chromecast/media/cma/backend/mixer/loopback_handler.cc index fd8c6e52ba6ff9..111bc502054938 100644 --- a/chromecast/media/cma/backend/mixer/loopback_handler.cc +++ b/chromecast/media/cma/backend/mixer/loopback_handler.cc @@ -94,6 +94,9 @@ class LoopbackHandler::ExternalLoopbackHandler ExternalAudioPipelineShlib::AddExternalLoopbackAudioObserver(this); } + ExternalLoopbackHandler(const ExternalLoopbackHandler&) = delete; + ExternalLoopbackHandler& operator=(const ExternalLoopbackHandler&) = delete; + void Destroy() { { base::AutoLock lock(lock_); @@ -135,8 +138,6 @@ class LoopbackHandler::ExternalLoopbackHandler base::Lock lock_; bool destroyed_ GUARDED_BY(lock_) = false; - - DISALLOW_COPY_AND_ASSIGN(ExternalLoopbackHandler); }; void LoopbackHandler::ExternalDeleter::operator()( diff --git a/chromecast/media/cma/backend/mixer/mixer_input.h b/chromecast/media/cma/backend/mixer/mixer_input.h index f1444406f67cab..c9abf108b95172 100644 --- a/chromecast/media/cma/backend/mixer/mixer_input.h +++ b/chromecast/media/cma/backend/mixer/mixer_input.h @@ -92,6 +92,10 @@ class MixerInput { }; MixerInput(Source* source, FilterGroup* filter_group); + + MixerInput(const MixerInput&) = delete; + MixerInput& operator=(const MixerInput&) = delete; + ~MixerInput(); void SetFilterGroup(FilterGroup* filter_group); @@ -204,8 +208,6 @@ class MixerInput { std::vector audio_output_redirectors_; SEQUENCE_CHECKER(sequence_checker_); - - DISALLOW_COPY_AND_ASSIGN(MixerInput); }; } // namespace media diff --git a/chromecast/media/cma/backend/mixer/mixer_output_stream_dummy.cc b/chromecast/media/cma/backend/mixer/mixer_output_stream_dummy.cc index 98f1bdca071073..6bc44ba725e09b 100644 --- a/chromecast/media/cma/backend/mixer/mixer_output_stream_dummy.cc +++ b/chromecast/media/cma/backend/mixer/mixer_output_stream_dummy.cc @@ -15,6 +15,9 @@ class MixerOutputStreamDummy : public MixerOutputStream { public: MixerOutputStreamDummy() = default; + MixerOutputStreamDummy(const MixerOutputStreamDummy&) = delete; + MixerOutputStreamDummy& operator=(const MixerOutputStreamDummy&) = delete; + // MixerOutputStream implementation: bool Start(int requested_sample_rate, int channels) override { return true; } @@ -36,9 +39,6 @@ class MixerOutputStreamDummy : public MixerOutputStream { } void Stop() override {} - - private: - DISALLOW_COPY_AND_ASSIGN(MixerOutputStreamDummy); }; // static diff --git a/chromecast/media/cma/backend/mixer/post_processors/governor_unittest.cc b/chromecast/media/cma/backend/mixer/post_processors/governor_unittest.cc index ea847b44dd08f5..3772ac23d00f40 100644 --- a/chromecast/media/cma/backend/mixer/post_processors/governor_unittest.cc +++ b/chromecast/media/cma/backend/mixer/post_processors/governor_unittest.cc @@ -43,6 +43,10 @@ void ScaleData(float* data, int frames, float scale) { } // namespace class GovernorTest : public ::testing::TestWithParam { + public: + GovernorTest(const GovernorTest&) = delete; + GovernorTest& operator=(const GovernorTest&) = delete; + protected: GovernorTest() : clamp_(kDefaultClamp), @@ -75,9 +79,6 @@ class GovernorTest : public ::testing::TestWithParam { std::unique_ptr governor_; AlignedBuffer data_; AlignedBuffer expected_; - - private: - DISALLOW_COPY_AND_ASSIGN(GovernorTest); }; TEST_P(GovernorTest, ZeroVolume) { diff --git a/chromecast/media/cma/backend/mixer/stream_mixer_external_audio_pipeline_unittest.cc b/chromecast/media/cma/backend/mixer/stream_mixer_external_audio_pipeline_unittest.cc index b322af463b9314..ac2b0c4443a0d8 100644 --- a/chromecast/media/cma/backend/mixer/stream_mixer_external_audio_pipeline_unittest.cc +++ b/chromecast/media/cma/backend/mixer/stream_mixer_external_audio_pipeline_unittest.cc @@ -42,6 +42,10 @@ class MockLoopbackAudioObserver this, &MockLoopbackAudioObserver::OnLoopbackAudioImpl)); } + MockLoopbackAudioObserver(const MockLoopbackAudioObserver&) = delete; + MockLoopbackAudioObserver& operator=(const MockLoopbackAudioObserver&) = + delete; + MOCK_METHOD6(OnLoopbackAudio, void(int64_t timestamp, SampleFormat sample_format, @@ -68,8 +72,6 @@ class MockLoopbackAudioObserver } std::vector data_; - - DISALLOW_COPY_AND_ASSIGN(MockLoopbackAudioObserver); }; class ExternalAudioPipelineTest : public ::testing::Test { @@ -78,6 +80,10 @@ class ExternalAudioPipelineTest : public ::testing::Test { : external_audio_pipeline_support_( testing::GetFakeExternalAudioPipelineSupport()) {} + ExternalAudioPipelineTest(const ExternalAudioPipelineTest&) = delete; + ExternalAudioPipelineTest& operator=(const ExternalAudioPipelineTest&) = + delete; + void SetUp() override { // Set that external library is supported. external_audio_pipeline_support_->SetSupported(); @@ -116,8 +122,6 @@ class ExternalAudioPipelineTest : public ::testing::Test { private: base::test::SingleThreadTaskEnvironment task_environment_{ base::test::TaskEnvironment::MainThreadType::IO}; - - DISALLOW_COPY_AND_ASSIGN(ExternalAudioPipelineTest); }; // Check that |expected| matches |actual| exactly. diff --git a/chromecast/media/cma/backend/mixer/stream_mixer_unittest.cc b/chromecast/media/cma/backend/mixer/stream_mixer_unittest.cc index 09e99775f18a21..7ade2c1b7bf2cd 100644 --- a/chromecast/media/cma/backend/mixer/stream_mixer_unittest.cc +++ b/chromecast/media/cma/backend/mixer/stream_mixer_unittest.cc @@ -376,6 +376,10 @@ std::string DeathRegex(const std::string& regex) { } // namespace class StreamMixerTest : public testing::Test { + public: + StreamMixerTest(const StreamMixerTest&) = delete; + StreamMixerTest& operator=(const StreamMixerTest&) = delete; + protected: StreamMixerTest() { auto output = std::make_unique>(); @@ -484,8 +488,6 @@ class StreamMixerTest : public testing::Test { MockMixerOutput* mock_output_; std::unique_ptr mixer_; MockPostProcessorFactory* pp_factory_; - - DISALLOW_COPY_AND_ASSIGN(StreamMixerTest); }; TEST_F(StreamMixerTest, AddSingleInput) { diff --git a/chromecast/media/cma/backend/system_volume_control.h b/chromecast/media/cma/backend/system_volume_control.h index e1fac1cf6ca423..4bc9b488c352d5 100644 --- a/chromecast/media/cma/backend/system_volume_control.h +++ b/chromecast/media/cma/backend/system_volume_control.h @@ -34,6 +34,10 @@ class SystemVolumeControl { static std::unique_ptr Create(Delegate* delegate); SystemVolumeControl() = default; + + SystemVolumeControl(const SystemVolumeControl&) = delete; + SystemVolumeControl& operator=(const SystemVolumeControl&) = delete; + virtual ~SystemVolumeControl() = default; // Returns the value that you would get if you called GetVolume() after @@ -57,9 +61,6 @@ class SystemVolumeControl { // Sets the volume limit to be applied to the system volume. virtual void SetLimit(float limit) = 0; - - private: - DISALLOW_COPY_AND_ASSIGN(SystemVolumeControl); }; } // namespace media diff --git a/chromecast/media/cma/base/balanced_media_task_runner_factory.cc b/chromecast/media/cma/base/balanced_media_task_runner_factory.cc index 8b0263d063911f..9c34e0225a94fc 100644 --- a/chromecast/media/cma/base/balanced_media_task_runner_factory.cc +++ b/chromecast/media/cma/base/balanced_media_task_runner_factory.cc @@ -32,6 +32,11 @@ class MediaTaskRunnerWithNotification : public MediaTaskRunner { base::RepeatingClosure new_task_cb, base::OnceClosure shutdown_cb); + MediaTaskRunnerWithNotification(const MediaTaskRunnerWithNotification&) = + delete; + MediaTaskRunnerWithNotification& operator=( + const MediaTaskRunnerWithNotification&) = delete; + // MediaTaskRunner implementation. bool PostMediaTask(const base::Location& from_here, base::OnceClosure task, @@ -44,8 +49,6 @@ class MediaTaskRunnerWithNotification : public MediaTaskRunner { const base::RepeatingClosure new_task_cb_; base::OnceClosure shutdown_cb_; - - DISALLOW_COPY_AND_ASSIGN(MediaTaskRunnerWithNotification); }; MediaTaskRunnerWithNotification::MediaTaskRunnerWithNotification( @@ -83,6 +86,9 @@ class BalancedMediaTaskRunner explicit BalancedMediaTaskRunner( const scoped_refptr& task_runner); + BalancedMediaTaskRunner(const BalancedMediaTaskRunner&) = delete; + BalancedMediaTaskRunner& operator=(const BalancedMediaTaskRunner&) = delete; + // Schedule tasks whose timestamp is less than or equal to |max_timestamp|. void ScheduleWork(base::TimeDelta max_timestamp); @@ -110,8 +116,6 @@ class BalancedMediaTaskRunner // Timestamp of the last posted task. // Is initialized to ::media::kNoTimestamp. base::TimeDelta last_timestamp_; - - DISALLOW_COPY_AND_ASSIGN(BalancedMediaTaskRunner); }; BalancedMediaTaskRunner::BalancedMediaTaskRunner( diff --git a/chromecast/media/cma/base/balanced_media_task_runner_factory.h b/chromecast/media/cma/base/balanced_media_task_runner_factory.h index df597bda68e855..e1f34d4cbf14c4 100644 --- a/chromecast/media/cma/base/balanced_media_task_runner_factory.h +++ b/chromecast/media/cma/base/balanced_media_task_runner_factory.h @@ -30,6 +30,11 @@ class BalancedMediaTaskRunnerFactory public: explicit BalancedMediaTaskRunnerFactory(base::TimeDelta max_delta); + BalancedMediaTaskRunnerFactory(const BalancedMediaTaskRunnerFactory&) = + delete; + BalancedMediaTaskRunnerFactory& operator=( + const BalancedMediaTaskRunnerFactory&) = delete; + // Creates a media task runner using |task_runner| as the underlying // regular task runner. // Restriction on the returned media task runner: @@ -58,8 +63,6 @@ class BalancedMediaTaskRunnerFactory // Task runners created by the factory that have not been unregistered yet. base::Lock lock_; MediaTaskRunnerSet task_runners_; - - DISALLOW_COPY_AND_ASSIGN(BalancedMediaTaskRunnerFactory); }; } // namespace media diff --git a/chromecast/media/cma/base/buffering_state.h b/chromecast/media/cma/base/buffering_state.h index 67f208e578ab22..3d1f7ca87ad6d3 100644 --- a/chromecast/media/cma/base/buffering_state.h +++ b/chromecast/media/cma/base/buffering_state.h @@ -20,6 +20,9 @@ class BufferingConfig : public base::RefCountedThreadSafe { BufferingConfig(base::TimeDelta low_level_threshold, base::TimeDelta high_level_threshold); + BufferingConfig(const BufferingConfig&) = delete; + BufferingConfig& operator=(const BufferingConfig&) = delete; + base::TimeDelta low_level() const { return low_level_threshold_; } base::TimeDelta high_level() const { return high_level_threshold_; } @@ -36,8 +39,6 @@ class BufferingConfig : public base::RefCountedThreadSafe { base::TimeDelta low_level_threshold_; base::TimeDelta high_level_threshold_; - - DISALLOW_COPY_AND_ASSIGN(BufferingConfig); }; class BufferingState @@ -62,6 +63,9 @@ class BufferingState const base::RepeatingClosure& state_changed_cb, const HighLevelBufferCB& high_level_buffer_cb); + BufferingState(const BufferingState&) = delete; + BufferingState& operator=(const BufferingState&) = delete; + // Returns the buffering state. State GetState() const { return state_; } @@ -130,8 +134,6 @@ class BufferingState // Buffered media time. // Equal to kNoTimestamp when not known. base::TimeDelta buffered_time_; - - DISALLOW_COPY_AND_ASSIGN(BufferingState); }; } // namespace media diff --git a/chromecast/media/cma/base/decoder_buffer_adapter.h b/chromecast/media/cma/base/decoder_buffer_adapter.h index fdda682771f814..4d52d9a1457561 100644 --- a/chromecast/media/cma/base/decoder_buffer_adapter.h +++ b/chromecast/media/cma/base/decoder_buffer_adapter.h @@ -30,6 +30,9 @@ class DecoderBufferAdapter : public DecoderBufferBase { DecoderBufferAdapter( StreamId stream_id, const scoped_refptr<::media::DecoderBuffer>& buffer); + DecoderBufferAdapter(const DecoderBufferAdapter&) = delete; + DecoderBufferAdapter& operator=(const DecoderBufferAdapter&) = delete; + // DecoderBufferBase implementation: StreamId stream_id() const override; int64_t timestamp() const override; @@ -46,8 +49,6 @@ class DecoderBufferAdapter : public DecoderBufferBase { StreamId stream_id_; scoped_refptr<::media::DecoderBuffer> const buffer_; std::unique_ptr decrypt_config_; - - DISALLOW_COPY_AND_ASSIGN(DecoderBufferAdapter); }; } // namespace media diff --git a/chromecast/media/cma/base/media_task_runner.h b/chromecast/media/cma/base/media_task_runner.h index c8cf16e8b9cd31..3f705b76f77ea4 100644 --- a/chromecast/media/cma/base/media_task_runner.h +++ b/chromecast/media/cma/base/media_task_runner.h @@ -19,6 +19,9 @@ class MediaTaskRunner public: MediaTaskRunner(); + MediaTaskRunner(const MediaTaskRunner&) = delete; + MediaTaskRunner& operator=(const MediaTaskRunner&) = delete; + // Post a task with the given media |timestamp|. If |timestamp| is equal to // |kNoTimestamp|, the task is scheduled right away. // How the media timestamp is used to schedule the task is an implementation @@ -32,9 +35,6 @@ class MediaTaskRunner protected: virtual ~MediaTaskRunner(); friend class base::RefCountedThreadSafe; - - private: - DISALLOW_COPY_AND_ASSIGN(MediaTaskRunner); }; } // namespace media diff --git a/chromecast/media/cma/base/simple_media_task_runner.h b/chromecast/media/cma/base/simple_media_task_runner.h index 379aa40e799a64..d26dc0cb84c2f2 100644 --- a/chromecast/media/cma/base/simple_media_task_runner.h +++ b/chromecast/media/cma/base/simple_media_task_runner.h @@ -23,6 +23,9 @@ class SimpleMediaTaskRunner : public MediaTaskRunner { SimpleMediaTaskRunner( const scoped_refptr& task_runner); + SimpleMediaTaskRunner(const SimpleMediaTaskRunner&) = delete; + SimpleMediaTaskRunner& operator=(const SimpleMediaTaskRunner&) = delete; + // MediaTaskRunner implementation. bool PostMediaTask(const base::Location& from_here, base::OnceClosure task, @@ -32,8 +35,6 @@ class SimpleMediaTaskRunner : public MediaTaskRunner { ~SimpleMediaTaskRunner() override; scoped_refptr const task_runner_; - - DISALLOW_COPY_AND_ASSIGN(SimpleMediaTaskRunner); }; } // namespace media diff --git a/chromecast/media/cma/decoder/cast_audio_decoder.cc b/chromecast/media/cma/decoder/cast_audio_decoder.cc index 008693a1da0f80..193ccee9d96a7e 100644 --- a/chromecast/media/cma/decoder/cast_audio_decoder.cc +++ b/chromecast/media/cma/decoder/cast_audio_decoder.cc @@ -94,6 +94,9 @@ class CastAudioDecoderImpl : public CastAudioDecoder { // (the pipeline status callback is posted to the task runner). } + CastAudioDecoderImpl(const CastAudioDecoderImpl&) = delete; + CastAudioDecoderImpl& operator=(const CastAudioDecoderImpl&) = delete; + // CastAudioDecoder implementation: const AudioConfig& GetOutputConfig() const override { return output_config_; } @@ -305,8 +308,6 @@ class CastAudioDecoderImpl : public CastAudioDecoder { base::WeakPtr weak_this_; base::WeakPtrFactory weak_factory_; - - DISALLOW_COPY_AND_ASSIGN(CastAudioDecoderImpl); }; } // namespace diff --git a/chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc b/chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc index ce041c4a1beb04..2c9600eaa1a575 100644 --- a/chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc +++ b/chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc @@ -60,6 +60,9 @@ class CastCdmContextForTest : public CastCdmContext { public: CastCdmContextForTest() : license_installed_(false) {} + CastCdmContextForTest(const CastCdmContextForTest&) = delete; + CastCdmContextForTest& operator=(const CastCdmContextForTest&) = delete; + void SetLicenseInstalled() { license_installed_ = true; event_callbacks_.Notify( @@ -92,8 +95,6 @@ class CastCdmContextForTest : public CastCdmContext { bool license_installed_; ::media::CallbackRegistry<::media::CdmContext::EventCB::RunType> event_callbacks_; - - DISALLOW_COPY_AND_ASSIGN(CastCdmContextForTest); }; // Helper class for managing pipeline setup, teardown, feeding data, stop/start @@ -110,6 +111,9 @@ class PipelineHelper { audio_decoder_delegate_(nullptr), video_decoder_delegate_(nullptr) {} + PipelineHelper(const PipelineHelper&) = delete; + PipelineHelper& operator=(const PipelineHelper&) = delete; + void Setup() { if (encrypted_) { cdm_context_.reset(new CastCdmContextForTest()); @@ -271,8 +275,6 @@ class PipelineHelper { CmaBackend::Decoder::Delegate* audio_decoder_delegate_; CmaBackend::Decoder::Delegate* video_decoder_delegate_; std::unique_ptr media_pipeline_; - - DISALLOW_COPY_AND_ASSIGN(PipelineHelper); }; using AudioVideoTuple = ::testing::tuple; @@ -282,6 +284,10 @@ class AudioVideoPipelineImplTest public: AudioVideoPipelineImplTest() {} + AudioVideoPipelineImplTest(const AudioVideoPipelineImplTest&) = delete; + AudioVideoPipelineImplTest& operator=(const AudioVideoPipelineImplTest&) = + delete; + protected: void SetUp() override { pipeline_helper_.reset(new PipelineHelper( @@ -291,8 +297,6 @@ class AudioVideoPipelineImplTest base::test::TaskEnvironment task_environment_; std::unique_ptr pipeline_helper_; - - DISALLOW_COPY_AND_ASSIGN(AudioVideoPipelineImplTest); }; static void VerifyPlay(PipelineHelper* pipeline_helper) { @@ -374,6 +378,10 @@ class EncryptedAVPipelineImplTest : public ::testing::Test { public: EncryptedAVPipelineImplTest() {} + EncryptedAVPipelineImplTest(const EncryptedAVPipelineImplTest&) = delete; + EncryptedAVPipelineImplTest& operator=(const EncryptedAVPipelineImplTest&) = + delete; + protected: void SetUp() override { pipeline_helper_.reset(new PipelineHelper(true, true, true)); @@ -382,8 +390,6 @@ class EncryptedAVPipelineImplTest : public ::testing::Test { base::test::TaskEnvironment task_environment_; std::unique_ptr pipeline_helper_; - - DISALLOW_COPY_AND_ASSIGN(EncryptedAVPipelineImplTest); }; // Sets a CDM with license already installed before starting the pipeline. diff --git a/chromecast/media/cma/pipeline/decrypt_util.h b/chromecast/media/cma/pipeline/decrypt_util.h index 144a9acfd9d7b4..7300a457788428 100644 --- a/chromecast/media/cma/pipeline/decrypt_util.h +++ b/chromecast/media/cma/pipeline/decrypt_util.h @@ -19,6 +19,9 @@ class DecoderBufferClear : public DecoderBufferBase { public: explicit DecoderBufferClear(scoped_refptr buffer); + DecoderBufferClear(const DecoderBufferClear&) = delete; + DecoderBufferClear& operator=(const DecoderBufferClear&) = delete; + // DecoderBufferBase implementation. StreamId stream_id() const override; int64_t timestamp() const override; @@ -33,8 +36,6 @@ class DecoderBufferClear : public DecoderBufferBase { ~DecoderBufferClear() override; const scoped_refptr buffer_; - - DISALLOW_COPY_AND_ASSIGN(DecoderBufferClear); }; using BufferDecryptedCB = diff --git a/chromecast/media/common/media_pipeline_backend_manager.h b/chromecast/media/common/media_pipeline_backend_manager.h index 235b6a872c7aa0..cdbadc70b331cd 100644 --- a/chromecast/media/common/media_pipeline_backend_manager.h +++ b/chromecast/media/common/media_pipeline_backend_manager.h @@ -89,6 +89,11 @@ class MediaPipelineBackendManager : public media::CmaBackendFactory { MediaPipelineBackendManager( scoped_refptr media_task_runner, MediaResourceTracker* media_resource_tracker); + + MediaPipelineBackendManager(const MediaPipelineBackendManager&) = delete; + MediaPipelineBackendManager& operator=(const MediaPipelineBackendManager&) = + delete; + ~MediaPipelineBackendManager() override; // media::CmaBackendFactory implementation: @@ -192,8 +197,6 @@ class MediaPipelineBackendManager : public media::CmaBackendFactory { int mixer_sfx_stream_count_ = 0; base::WeakPtrFactory weak_factory_; - - DISALLOW_COPY_AND_ASSIGN(MediaPipelineBackendManager); }; } // namespace media diff --git a/chromecast/media/common/media_resource_tracker.h b/chromecast/media/common/media_resource_tracker.h index 38dfa9f0152b9a..287a9b1ded90b4 100644 --- a/chromecast/media/common/media_resource_tracker.h +++ b/chromecast/media/common/media_resource_tracker.h @@ -54,6 +54,9 @@ class MediaResourceTracker { scoped_refptr ui_task_runner, scoped_refptr media_task_runner); + MediaResourceTracker(const MediaResourceTracker&) = delete; + MediaResourceTracker& operator=(const MediaResourceTracker&) = delete; + // Media resource acquire implementation. Must call on ui thread; runs // CastMediaShlib::Initialize on media thread. Safe to call even if media lib // already initialized. @@ -103,8 +106,6 @@ class MediaResourceTracker { scoped_refptr ui_task_runner_; scoped_refptr media_task_runner_; - - DISALLOW_COPY_AND_ASSIGN(MediaResourceTracker); }; } // namespace media diff --git a/chromecast/net/connectivity_checker.h b/chromecast/net/connectivity_checker.h index ae8938f8fb466b..c5aff76e3b915e 100644 --- a/chromecast/net/connectivity_checker.h +++ b/chromecast/net/connectivity_checker.h @@ -30,15 +30,15 @@ class ConnectivityChecker public: class ConnectivityObserver { public: + ConnectivityObserver(const ConnectivityObserver&) = delete; + ConnectivityObserver& operator=(const ConnectivityObserver&) = delete; + // Will be called when internet connectivity changes. virtual void OnConnectivityChanged(bool connected) = 0; protected: ConnectivityObserver() {} virtual ~ConnectivityObserver() {} - - private: - DISALLOW_COPY_AND_ASSIGN(ConnectivityObserver); }; static scoped_refptr Create( @@ -48,6 +48,9 @@ class ConnectivityChecker network::NetworkConnectionTracker* network_connection_tracker, TimeSyncTracker* time_sync_tracker = nullptr); + ConnectivityChecker(const ConnectivityChecker&) = delete; + ConnectivityChecker& operator=(const ConnectivityChecker&) = delete; + void AddConnectivityObserver(ConnectivityObserver* observer); void RemoveConnectivityObserver(ConnectivityObserver* observer); @@ -71,8 +74,6 @@ class ConnectivityChecker const scoped_refptr> connectivity_observer_list_; - - DISALLOW_COPY_AND_ASSIGN(ConnectivityChecker); }; } // namespace chromecast diff --git a/chromecast/net/connectivity_checker_impl.h b/chromecast/net/connectivity_checker_impl.h index 378cf4c314e7ca..1e2397f72704b0 100644 --- a/chromecast/net/connectivity_checker_impl.h +++ b/chromecast/net/connectivity_checker_impl.h @@ -73,6 +73,9 @@ class ConnectivityCheckerImpl network::NetworkConnectionTracker* network_connection_tracker, TimeSyncTracker* time_sync_tracker); + ConnectivityCheckerImpl(const ConnectivityCheckerImpl&) = delete; + ConnectivityCheckerImpl& operator=(const ConnectivityCheckerImpl&) = delete; + // ConnectivityChecker implementation: bool Connected() const override; void Check() override; @@ -147,8 +150,6 @@ class ConnectivityCheckerImpl base::WeakPtr weak_this_; base::WeakPtrFactory weak_factory_; - - DISALLOW_COPY_AND_ASSIGN(ConnectivityCheckerImpl); }; } // namespace chromecast diff --git a/chromecast/net/fake_connectivity_checker.h b/chromecast/net/fake_connectivity_checker.h index c3a5ac3d0cfd5d..37fec7a449caaf 100644 --- a/chromecast/net/fake_connectivity_checker.h +++ b/chromecast/net/fake_connectivity_checker.h @@ -16,6 +16,9 @@ class FakeConnectivityChecker : public ConnectivityChecker { public: FakeConnectivityChecker(); + FakeConnectivityChecker(const FakeConnectivityChecker&) = delete; + FakeConnectivityChecker& operator=(const FakeConnectivityChecker&) = delete; + // ConnectivityChecker implementation: bool Connected() const override; void Check() override; @@ -29,8 +32,6 @@ class FakeConnectivityChecker : public ConnectivityChecker { private: friend class base::RefCountedThreadSafe; bool connected_; - - DISALLOW_COPY_AND_ASSIGN(FakeConnectivityChecker); }; } // namespace chromecast diff --git a/chromecast/net/io_buffer_pool.cc b/chromecast/net/io_buffer_pool.cc index 15e9887db706d7..28bbf047f870c4 100644 --- a/chromecast/net/io_buffer_pool.cc +++ b/chromecast/net/io_buffer_pool.cc @@ -41,6 +41,9 @@ class IOBufferPool::Internal { public: Internal(size_t buffer_size, size_t max_buffers, bool threadsafe); + Internal(const Internal&) = delete; + Internal& operator=(const Internal&) = delete; + size_t num_allocated() const { base::AutoLockMaybe lock(lock_ptr_); return num_allocated_; @@ -81,21 +84,20 @@ class IOBufferPool::Internal { size_t num_free_; int refs_; - - DISALLOW_COPY_AND_ASSIGN(Internal); }; class IOBufferPool::Internal::Buffer : public net::IOBuffer { public: explicit Buffer(char* data) : net::IOBuffer(data) {} + Buffer(const Buffer&) = delete; + Buffer& operator=(const Buffer&) = delete; + private: friend class Wrapper; ~Buffer() override { data_ = nullptr; } static void operator delete(void* ptr); - - DISALLOW_COPY_AND_ASSIGN(Buffer); }; class IOBufferPool::Internal::Wrapper { diff --git a/chromecast/net/io_buffer_pool.h b/chromecast/net/io_buffer_pool.h index e57e4769ffaa42..07aa712452f740 100644 --- a/chromecast/net/io_buffer_pool.h +++ b/chromecast/net/io_buffer_pool.h @@ -28,6 +28,9 @@ class IOBufferPool : public base::RefCountedThreadSafe { // If |max_buffers| is not specified, the maximum value of size_t is used. explicit IOBufferPool(size_t buffer_size); + IOBufferPool(const IOBufferPool&) = delete; + IOBufferPool& operator=(const IOBufferPool&) = delete; + size_t buffer_size() const { return buffer_size_; } size_t max_buffers() const { return max_buffers_; } bool threadsafe() const { return threadsafe_; } @@ -59,8 +62,6 @@ class IOBufferPool : public base::RefCountedThreadSafe { const size_t max_buffers_; const bool threadsafe_; Internal* internal_; // Manages its own lifetime. - - DISALLOW_COPY_AND_ASSIGN(IOBufferPool); }; } // namespace chromecast diff --git a/chromecast/net/small_message_socket.h b/chromecast/net/small_message_socket.h index b85e9022ef8c76..7f9284001ef28b 100644 --- a/chromecast/net/small_message_socket.h +++ b/chromecast/net/small_message_socket.h @@ -62,6 +62,10 @@ class SmallMessageSocket { }; SmallMessageSocket(Delegate* delegate, std::unique_ptr socket); + + SmallMessageSocket(const SmallMessageSocket&) = delete; + SmallMessageSocket& operator=(const SmallMessageSocket&) = delete; + virtual ~SmallMessageSocket(); net::Socket* socket() const { return socket_.get(); } @@ -155,8 +159,6 @@ class SmallMessageSocket { bool in_message_ = false; base::WeakPtrFactory weak_factory_; - - DISALLOW_COPY_AND_ASSIGN(SmallMessageSocket); }; } // namespace chromecast diff --git a/chromecast/renderer/cast_websocket_handshake_throttle_provider.h b/chromecast/renderer/cast_websocket_handshake_throttle_provider.h index d8e0da81a9b33b..e5a7800e54b713 100644 --- a/chromecast/renderer/cast_websocket_handshake_throttle_provider.h +++ b/chromecast/renderer/cast_websocket_handshake_throttle_provider.h @@ -23,6 +23,10 @@ class CastWebSocketHandshakeThrottleProvider public: explicit CastWebSocketHandshakeThrottleProvider( CastActivityUrlFilterManager* url_filter_manager); + + CastWebSocketHandshakeThrottleProvider& operator=( + const CastWebSocketHandshakeThrottleProvider&) = delete; + ~CastWebSocketHandshakeThrottleProvider() override; // blink::WebSocketHandshakeThrottleProvider implementation: @@ -41,8 +45,6 @@ class CastWebSocketHandshakeThrottleProvider CastActivityUrlFilterManager* const cast_activity_url_filter_manager_; THREAD_CHECKER(thread_checker_); - - DISALLOW_ASSIGN(CastWebSocketHandshakeThrottleProvider); }; } // namespace chromecast diff --git a/chromecast/renderer/native_bindings_helper.h b/chromecast/renderer/native_bindings_helper.h index 96a9a52423191f..b7cffb018822c8 100644 --- a/chromecast/renderer/native_bindings_helper.h +++ b/chromecast/renderer/native_bindings_helper.h @@ -55,6 +55,9 @@ v8::Local InstallBinding(v8::Isolate* isolate, // destroyed. class CastBinding : public content::RenderFrameObserver { public: + CastBinding(const CastBinding&) = delete; + CastBinding& operator=(const CastBinding&) = delete; + void TryInstall(); protected: @@ -70,9 +73,6 @@ class CastBinding : public content::RenderFrameObserver { // the binding is updated in every call. virtual void Install(v8::Local cast_platform, v8::Isolate* isolate) = 0; - - private: - DISALLOW_COPY_AND_ASSIGN(CastBinding); }; } // namespace chromecast diff --git a/chromecast/utility/cast_content_utility_client.h b/chromecast/utility/cast_content_utility_client.h index 15e041b01b8027..0d6c0b49562237 100644 --- a/chromecast/utility/cast_content_utility_client.h +++ b/chromecast/utility/cast_content_utility_client.h @@ -23,6 +23,9 @@ class CastContentUtilityClient : public content::ContentUtilityClient { CastContentUtilityClient(); + CastContentUtilityClient(const CastContentUtilityClient&) = delete; + CastContentUtilityClient& operator=(const CastContentUtilityClient&) = delete; + // cast::ContentUtilityClient: bool HandleServiceRequestDeprecated( const std::string& service_name, @@ -31,9 +34,6 @@ class CastContentUtilityClient : public content::ContentUtilityClient { virtual bool HandleServiceRequest( const std::string& service_name, mojo::PendingReceiver receiver); - - private: - DISALLOW_COPY_AND_ASSIGN(CastContentUtilityClient); }; } // namespace shell