Replace DISALLOW_COPY_AND_ASSIGN in net/
This replaces DISALLOW_COPY_AND_ASSIGN with explicit constructor deletes
where a local script is able to detect its insertion place (~Foo() is
public => insert before this line).
This is incomplete as not all classes have a public ~Foo() declared, so
not all DISALLOW_COPY_AND_ASSIGN occurrences are replaced.
IWYU cleanup is left as a separate pass that is easier when these macros
go away.
Bug: 1010217
Change-Id: Ie30b152cdd5d493c5b2ecd96d13d789c18123f2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3174408
Auto-Submit: Peter Boström <[email protected]>
Commit-Queue: Daniel Cheng <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Owners-Override: Daniel Cheng <[email protected]>
Cr-Commit-Position: refs/heads/main@{#923926}
diff --git a/net/cert/caching_cert_verifier.h b/net/cert/caching_cert_verifier.h
index 3c31f73..72a46fc6 100644
--- a/net/cert/caching_cert_verifier.h
+++ b/net/cert/caching_cert_verifier.h
@@ -41,6 +41,9 @@
// item has expired.
explicit CachingCertVerifier(std::unique_ptr<CertVerifier> verifier);
+ CachingCertVerifier(const CachingCertVerifier&) = delete;
+ CachingCertVerifier& operator=(const CachingCertVerifier&) = delete;
+
~CachingCertVerifier() override;
// CertVerifier implementation:
@@ -130,8 +133,6 @@
uint64_t requests_;
uint64_t cache_hits_;
-
- DISALLOW_COPY_AND_ASSIGN(CachingCertVerifier);
};
} // namespace net
diff --git a/net/cert/cert_database.h b/net/cert/cert_database.h
index 6a06a39..53c339b 100644
--- a/net/cert/cert_database.h
+++ b/net/cert/cert_database.h
@@ -37,6 +37,9 @@
// CertDatabase::RemoveObserver.
class NET_EXPORT Observer {
public:
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
virtual ~Observer() {}
// Called whenever the Cert Database is known to have changed.
@@ -47,9 +50,6 @@
protected:
Observer() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
// Returns the CertDatabase singleton.
diff --git a/net/cert/cert_verifier.h b/net/cert/cert_verifier.h
index 510b727..170a964 100644
--- a/net/cert/cert_verifier.h
+++ b/net/cert/cert_verifier.h
@@ -77,11 +77,11 @@
public:
Request() {}
+ Request(const Request&) = delete;
+ Request& operator=(const Request&) = delete;
+
// Destruction of the Request cancels it.
virtual ~Request() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Request);
};
enum VerifyFlags {
diff --git a/net/cert/client_cert_verifier.h b/net/cert/client_cert_verifier.h
index 5109f54f..ccb60f12 100644
--- a/net/cert/client_cert_verifier.h
+++ b/net/cert/client_cert_verifier.h
@@ -22,11 +22,11 @@
public:
Request() {}
+ Request(const Request&) = delete;
+ Request& operator=(const Request&) = delete;
+
// Destruction of the Request cancels it.
virtual ~Request() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Request);
};
virtual ~ClientCertVerifier() {}
diff --git a/net/cert/coalescing_cert_verifier.h b/net/cert/coalescing_cert_verifier.h
index 60b4682..07f1df6b 100644
--- a/net/cert/coalescing_cert_verifier.h
+++ b/net/cert/coalescing_cert_verifier.h
@@ -34,6 +34,9 @@
// any in-flight, not-yet-completed calls to Verify().
explicit CoalescingCertVerifier(std::unique_ptr<CertVerifier> verifier);
+ CoalescingCertVerifier(const CoalescingCertVerifier&) = delete;
+ CoalescingCertVerifier& operator=(const CoalescingCertVerifier&) = delete;
+
~CoalescingCertVerifier() override;
// CertVerifier implementation:
@@ -71,8 +74,6 @@
uint32_t config_id_;
uint64_t requests_;
uint64_t inflight_joins_;
-
- DISALLOW_COPY_AND_ASSIGN(CoalescingCertVerifier);
};
} // namespace net
diff --git a/net/cert/do_nothing_ct_verifier.h b/net/cert/do_nothing_ct_verifier.h
index 64eacf3..a9da0d8a 100644
--- a/net/cert/do_nothing_ct_verifier.h
+++ b/net/cert/do_nothing_ct_verifier.h
@@ -48,6 +48,10 @@
class NET_EXPORT DoNothingCTVerifier : public CTVerifier {
public:
DoNothingCTVerifier();
+
+ DoNothingCTVerifier(const DoNothingCTVerifier&) = delete;
+ DoNothingCTVerifier& operator=(const DoNothingCTVerifier&) = delete;
+
~DoNothingCTVerifier() override;
void Verify(base::StringPiece hostname,
@@ -56,9 +60,6 @@
base::StringPiece sct_list_from_tls_extension,
SignedCertificateTimestampAndStatusList* output_scts,
const NetLogWithSource& net_log) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DoNothingCTVerifier);
};
} // namespace net
diff --git a/net/cert/internal/cert_error_params.h b/net/cert/internal/cert_error_params.h
index f2defece..f3f4bf8 100644
--- a/net/cert/internal/cert_error_params.h
+++ b/net/cert/internal/cert_error_params.h
@@ -26,14 +26,15 @@
class NET_EXPORT CertErrorParams {
public:
CertErrorParams();
+
+ CertErrorParams(const CertErrorParams&) = delete;
+ CertErrorParams& operator=(const CertErrorParams&) = delete;
+
virtual ~CertErrorParams();
// Creates a representation of this parameter as a string, which may be
// used for pretty printing the error.
virtual std::string ToDebugString() const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CertErrorParams);
};
// Creates a parameter object that holds a copy of |der|, and names it |name|
diff --git a/net/cert/internal/cert_issuer_source.h b/net/cert/internal/cert_issuer_source.h
index c38b61d2..8127203 100644
--- a/net/cert/internal/cert_issuer_source.h
+++ b/net/cert/internal/cert_issuer_source.h
@@ -25,6 +25,10 @@
class NET_EXPORT Request {
public:
Request() = default;
+
+ Request(const Request&) = delete;
+ Request& operator=(const Request&) = delete;
+
// Destruction of the Request cancels it.
virtual ~Request() = default;
@@ -36,9 +40,6 @@
// indicates that the issuers have been exhausted and GetNext() should
// not be called again.
virtual void GetNext(ParsedCertificateList* issuers) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Request);
};
virtual ~CertIssuerSource() = default;
diff --git a/net/cert/internal/cert_issuer_source_aia.cc b/net/cert/internal/cert_issuer_source_aia.cc
index 7892006f..559329c 100644
--- a/net/cert/internal/cert_issuer_source_aia.cc
+++ b/net/cert/internal/cert_issuer_source_aia.cc
@@ -55,6 +55,10 @@
class AiaRequest : public CertIssuerSource::Request {
public:
AiaRequest() = default;
+
+ AiaRequest(const AiaRequest&) = delete;
+ AiaRequest& operator=(const AiaRequest&) = delete;
+
~AiaRequest() override;
// CertIssuerSource::Request implementation.
@@ -70,8 +74,6 @@
private:
std::vector<std::unique_ptr<CertNetFetcher::Request>> cert_fetcher_requests_;
size_t current_request_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(AiaRequest);
};
AiaRequest::~AiaRequest() = default;
diff --git a/net/cert/internal/cert_issuer_source_aia.h b/net/cert/internal/cert_issuer_source_aia.h
index 3e62c95..1503d43 100644
--- a/net/cert/internal/cert_issuer_source_aia.h
+++ b/net/cert/internal/cert_issuer_source_aia.h
@@ -20,6 +20,10 @@
// used only on a single thread, which is the thread |cert_fetcher| will be
// operated from.
explicit CertIssuerSourceAia(scoped_refptr<CertNetFetcher> cert_fetcher);
+
+ CertIssuerSourceAia(const CertIssuerSourceAia&) = delete;
+ CertIssuerSourceAia& operator=(const CertIssuerSourceAia&) = delete;
+
~CertIssuerSourceAia() override;
// CertIssuerSource implementation:
@@ -30,8 +34,6 @@
private:
scoped_refptr<CertNetFetcher> cert_fetcher_;
-
- DISALLOW_COPY_AND_ASSIGN(CertIssuerSourceAia);
};
} // namespace net
diff --git a/net/cert/internal/cert_issuer_source_static.h b/net/cert/internal/cert_issuer_source_static.h
index 4f9240b6..39d3187 100644
--- a/net/cert/internal/cert_issuer_source_static.h
+++ b/net/cert/internal/cert_issuer_source_static.h
@@ -17,6 +17,10 @@
class NET_EXPORT CertIssuerSourceStatic : public CertIssuerSource {
public:
CertIssuerSourceStatic();
+
+ CertIssuerSourceStatic(const CertIssuerSourceStatic&) = delete;
+ CertIssuerSourceStatic& operator=(const CertIssuerSourceStatic&) = delete;
+
~CertIssuerSourceStatic() override;
// Adds |cert| to the set of certificates that this CertIssuerSource will
@@ -36,8 +40,6 @@
scoped_refptr<ParsedCertificate>,
base::StringPieceHash>
intermediates_;
-
- DISALLOW_COPY_AND_ASSIGN(CertIssuerSourceStatic);
};
} // namespace net
diff --git a/net/cert/internal/path_builder.h b/net/cert/internal/path_builder.h
index e4463fd..945ca1a 100644
--- a/net/cert/internal/path_builder.h
+++ b/net/cert/internal/path_builder.h
@@ -110,6 +110,10 @@
struct NET_EXPORT Result : public base::SupportsUserData {
Result();
Result(Result&&);
+
+ Result(const Result&) = delete;
+ Result& operator=(const Result&) = delete;
+
~Result() override;
Result& operator=(Result&&);
@@ -141,9 +145,6 @@
// True if the search stopped because it exceeded the deadline configured
// with |SetDeadline|.
bool exceeded_deadline = false;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Result);
};
// Creates a CertPathBuilder that attempts to find a path from |cert| to a
@@ -168,6 +169,10 @@
const std::set<der::Input>& user_initial_policy_set,
InitialPolicyMappingInhibit initial_policy_mapping_inhibit,
InitialAnyPolicyInhibit initial_any_policy_inhibit);
+
+ CertPathBuilder(const CertPathBuilder&) = delete;
+ CertPathBuilder& operator=(const CertPathBuilder&) = delete;
+
~CertPathBuilder();
// Adds a CertIssuerSource to provide intermediates for use in path building.
@@ -223,8 +228,6 @@
uint32_t max_iteration_count_ = 0;
base::TimeTicks deadline_;
bool explore_all_paths_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(CertPathBuilder);
};
} // namespace net
diff --git a/net/cert/internal/path_builder_unittest.cc b/net/cert/internal/path_builder_unittest.cc
index 03237b4..d2181e2 100644
--- a/net/cert/internal/path_builder_unittest.cc
+++ b/net/cert/internal/path_builder_unittest.cc
@@ -56,6 +56,10 @@
issuers_.swap(issuers);
issuers_iter_ = issuers_.begin();
}
+
+ StaticAsyncRequest(const StaticAsyncRequest&) = delete;
+ StaticAsyncRequest& operator=(const StaticAsyncRequest&) = delete;
+
~StaticAsyncRequest() override = default;
void GetNext(ParsedCertificateList* out_certs) override {
@@ -65,8 +69,6 @@
ParsedCertificateList issuers_;
ParsedCertificateList::iterator issuers_iter_;
-
- DISALLOW_COPY_AND_ASSIGN(StaticAsyncRequest);
};
~AsyncCertIssuerSourceStatic() override = default;
diff --git a/net/cert/internal/signature_algorithm.h b/net/cert/internal/signature_algorithm.h
index 5892d8a..bb06ec5 100644
--- a/net/cert/internal/signature_algorithm.h
+++ b/net/cert/internal/signature_algorithm.h
@@ -60,10 +60,12 @@
class NET_EXPORT SignatureAlgorithmParameters {
public:
SignatureAlgorithmParameters() {}
- virtual ~SignatureAlgorithmParameters() {}
- private:
- DISALLOW_COPY_AND_ASSIGN(SignatureAlgorithmParameters);
+ SignatureAlgorithmParameters(const SignatureAlgorithmParameters&) = delete;
+ SignatureAlgorithmParameters& operator=(const SignatureAlgorithmParameters&) =
+ delete;
+
+ virtual ~SignatureAlgorithmParameters() {}
};
// Parameters for an RSASSA-PSS signature algorithm.
@@ -87,6 +89,9 @@
// corresponds to "AlgorithmIdentifier" from RFC 5280.
class NET_EXPORT SignatureAlgorithm {
public:
+ SignatureAlgorithm(const SignatureAlgorithm&) = delete;
+ SignatureAlgorithm& operator=(const SignatureAlgorithm&) = delete;
+
~SignatureAlgorithm();
SignatureAlgorithmId algorithm() const { return algorithm_; }
@@ -135,8 +140,6 @@
const SignatureAlgorithmId algorithm_;
const DigestAlgorithm digest_;
const std::unique_ptr<SignatureAlgorithmParameters> params_;
-
- DISALLOW_COPY_AND_ASSIGN(SignatureAlgorithm);
};
} // namespace net
diff --git a/net/cert/internal/system_trust_store_nss_unittest.cc b/net/cert/internal/system_trust_store_nss_unittest.cc
index 67839a32..460adef 100644
--- a/net/cert/internal/system_trust_store_nss_unittest.cc
+++ b/net/cert/internal/system_trust_store_nss_unittest.cc
@@ -49,6 +49,10 @@
class SystemTrustStoreNSSTest : public ::testing::Test {
public:
SystemTrustStoreNSSTest() : test_root_certs_(TestRootCerts::GetInstance()) {}
+
+ SystemTrustStoreNSSTest(const SystemTrustStoreNSSTest&) = delete;
+ SystemTrustStoreNSSTest& operator=(const SystemTrustStoreNSSTest&) = delete;
+
~SystemTrustStoreNSSTest() override = default;
void SetUp() override {
@@ -91,9 +95,6 @@
scoped_refptr<X509Certificate> root_cert_;
scoped_refptr<ParsedCertificate> parsed_root_cert_;
ScopedCERTCertificate nss_root_cert_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SystemTrustStoreNSSTest);
};
// Tests that SystemTrustStore created for NSS with a user-slot restriction
diff --git a/net/cert/internal/trust_store_collection.h b/net/cert/internal/trust_store_collection.h
index 68d467e..f16f28e 100644
--- a/net/cert/internal/trust_store_collection.h
+++ b/net/cert/internal/trust_store_collection.h
@@ -19,6 +19,10 @@
class NET_EXPORT TrustStoreCollection : public TrustStore {
public:
TrustStoreCollection();
+
+ TrustStoreCollection(const TrustStoreCollection&) = delete;
+ TrustStoreCollection& operator=(const TrustStoreCollection&) = delete;
+
~TrustStoreCollection() override;
// Includes results from |store| in the combined output. |store| must
@@ -33,8 +37,6 @@
private:
std::vector<TrustStore*> stores_;
-
- DISALLOW_COPY_AND_ASSIGN(TrustStoreCollection);
};
} // namespace net
diff --git a/net/cert/internal/trust_store_in_memory.h b/net/cert/internal/trust_store_in_memory.h
index 39e244f2..9aa4330 100644
--- a/net/cert/internal/trust_store_in_memory.h
+++ b/net/cert/internal/trust_store_in_memory.h
@@ -19,6 +19,10 @@
class NET_EXPORT TrustStoreInMemory : public TrustStore {
public:
TrustStoreInMemory();
+
+ TrustStoreInMemory(const TrustStoreInMemory&) = delete;
+ TrustStoreInMemory& operator=(const TrustStoreInMemory&) = delete;
+
~TrustStoreInMemory() override;
// Returns whether the TrustStore is in the initial empty state.
@@ -72,8 +76,6 @@
// distrusted certificates require a full DER match.
void AddCertificate(scoped_refptr<ParsedCertificate> cert,
const CertificateTrust& trust);
-
- DISALLOW_COPY_AND_ASSIGN(TrustStoreInMemory);
};
} // namespace net
diff --git a/net/cert/internal/trust_store_mac.cc b/net/cert/internal/trust_store_mac.cc
index 8236c4a..50f94d875 100644
--- a/net/cert/internal/trust_store_mac.cc
+++ b/net/cert/internal/trust_store_mac.cc
@@ -509,6 +509,9 @@
base::Unretained(this)));
}
+ KeychainTrustObserver(const KeychainTrustObserver&) = delete;
+ KeychainTrustObserver& operator=(const KeychainTrustObserver&) = delete;
+
// Destroying the observer unregisters the callback. Must be destroyed on the
// notification thread in order to safely release |subscription_|.
~KeychainTrustObserver() {
@@ -533,8 +536,6 @@
base::CallbackListSubscription subscription_;
base::subtle::Atomic64 iteration_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(KeychainTrustObserver);
};
} // namespace
@@ -598,6 +599,9 @@
keychain_observer_ = std::make_unique<KeychainTrustObserver>();
}
+ TrustImplDomainCache(const TrustImplDomainCache&) = delete;
+ TrustImplDomainCache& operator=(const TrustImplDomainCache&) = delete;
+
~TrustImplDomainCache() override {
GetNetworkNotificationThreadMac()->DeleteSoon(
FROM_HERE, std::move(keychain_observer_));
@@ -671,8 +675,6 @@
TrustDomainCache system_domain_cache_;
TrustDomainCache admin_domain_cache_;
TrustDomainCache user_domain_cache_;
-
- DISALLOW_COPY_AND_ASSIGN(TrustImplDomainCache);
};
// TrustImplNoCache is the simplest approach which calls
@@ -681,6 +683,9 @@
public:
explicit TrustImplNoCache(CFStringRef policy_oid) : policy_oid_(policy_oid) {}
+ TrustImplNoCache(const TrustImplNoCache&) = delete;
+ TrustImplNoCache& operator=(const TrustImplNoCache&) = delete;
+
~TrustImplNoCache() override = default;
// Returns true if |cert| is present in kSecTrustSettingsDomainSystem.
@@ -707,8 +712,6 @@
private:
const CFStringRef policy_oid_;
-
- DISALLOW_COPY_AND_ASSIGN(TrustImplNoCache);
};
// TrustImplMRUCache is calls SecTrustSettingsCopyTrustSettings on every cert
@@ -721,6 +724,9 @@
keychain_observer_ = std::make_unique<KeychainTrustObserver>();
}
+ TrustImplMRUCache(const TrustImplMRUCache&) = delete;
+ TrustImplMRUCache& operator=(const TrustImplMRUCache&) = delete;
+
~TrustImplMRUCache() override {
GetNetworkNotificationThreadMac()->DeleteSoon(
FROM_HERE, std::move(keychain_observer_));
@@ -843,8 +849,6 @@
// not cache their results, as it isn't clear whether the calculated result
// applies to the new or old trust settings.
int64_t iteration_ = -1;
-
- DISALLOW_COPY_AND_ASSIGN(TrustImplMRUCache);
};
TrustStoreMac::TrustStoreMac(CFStringRef policy_oid,
diff --git a/net/cert/internal/trust_store_nss.h b/net/cert/internal/trust_store_nss.h
index fca64b26..794fedc 100644
--- a/net/cert/internal/trust_store_nss.h
+++ b/net/cert/internal/trust_store_nss.h
@@ -58,6 +58,9 @@
TrustStoreNSS(SECTrustType trust_type,
IgnoreSystemTrustSettings ignore_system_trust_settings);
+ TrustStoreNSS(const TrustStoreNSS&) = delete;
+ TrustStoreNSS& operator=(const TrustStoreNSS&) = delete;
+
~TrustStoreNSS() override;
// CertIssuerSource implementation:
@@ -99,8 +102,6 @@
// (*) are stored on |user_slot_|.
const bool filter_trusted_certs_by_slot_;
crypto::ScopedPK11Slot user_slot_;
-
- DISALLOW_COPY_AND_ASSIGN(TrustStoreNSS);
};
} // namespace net
diff --git a/net/cert/multi_threaded_cert_verifier.h b/net/cert/multi_threaded_cert_verifier.h
index 05c5463..ed9be2b 100644
--- a/net/cert/multi_threaded_cert_verifier.h
+++ b/net/cert/multi_threaded_cert_verifier.h
@@ -32,6 +32,10 @@
public:
explicit MultiThreadedCertVerifier(scoped_refptr<CertVerifyProc> verify_proc);
+ MultiThreadedCertVerifier(const MultiThreadedCertVerifier&) = delete;
+ MultiThreadedCertVerifier& operator=(const MultiThreadedCertVerifier&) =
+ delete;
+
// When the verifier is destroyed, all certificate verifications requests are
// canceled, and their completion callbacks will not be called.
~MultiThreadedCertVerifier() override;
@@ -65,8 +69,6 @@
#endif
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(MultiThreadedCertVerifier);
};
} // namespace net
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc
index c71c61e..08c1ab8 100644
--- a/net/cert/nss_cert_database.cc
+++ b/net/cert/nss_cert_database.cc
@@ -57,14 +57,16 @@
explicit CertNotificationForwarder(CertDatabase* cert_db)
: cert_db_(cert_db) {}
+ CertNotificationForwarder(const CertNotificationForwarder&) = delete;
+ CertNotificationForwarder& operator=(const CertNotificationForwarder&) =
+ delete;
+
~CertNotificationForwarder() override = default;
void OnCertDBChanged() override { cert_db_->NotifyObserversCertDBChanged(); }
private:
CertDatabase* cert_db_;
-
- DISALLOW_COPY_AND_ASSIGN(CertNotificationForwarder);
};
} // namespace
diff --git a/net/cert/nss_cert_database.h b/net/cert/nss_cert_database.h
index dbb37b8..d39248a00 100644
--- a/net/cert/nss_cert_database.h
+++ b/net/cert/nss_cert_database.h
@@ -37,6 +37,9 @@
public:
class NET_EXPORT Observer {
public:
+ Observer(const Observer&) = delete;
+ Observer& operator=(const Observer&) = delete;
+
virtual ~Observer() {}
// Will be called when a certificate is added, removed, or trust settings
@@ -45,9 +48,6 @@
protected:
Observer() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Observer);
};
// Holds an NSS certificate along with additional information.
@@ -137,6 +137,10 @@
// be identical.
NSSCertDatabase(crypto::ScopedPK11Slot public_slot,
crypto::ScopedPK11Slot private_slot);
+
+ NSSCertDatabase(const NSSCertDatabase&) = delete;
+ NSSCertDatabase& operator=(const NSSCertDatabase&) = delete;
+
virtual ~NSSCertDatabase();
// Asynchronously get a list of unique certificates in the certificate
@@ -331,8 +335,6 @@
const scoped_refptr<base::ObserverListThreadSafe<Observer>> observer_list_;
base::WeakPtrFactory<NSSCertDatabase> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NSSCertDatabase);
};
} // namespace net
diff --git a/net/cert/nss_cert_database_chromeos.h b/net/cert/nss_cert_database_chromeos.h
index 2c00afe..1ad325ad 100644
--- a/net/cert/nss_cert_database_chromeos.h
+++ b/net/cert/nss_cert_database_chromeos.h
@@ -19,6 +19,10 @@
public:
NSSCertDatabaseChromeOS(crypto::ScopedPK11Slot public_slot,
crypto::ScopedPK11Slot private_slot);
+
+ NSSCertDatabaseChromeOS(const NSSCertDatabaseChromeOS&) = delete;
+ NSSCertDatabaseChromeOS& operator=(const NSSCertDatabaseChromeOS&) = delete;
+
~NSSCertDatabaseChromeOS() override;
// |system_slot| is the system TPM slot, which is only enabled for certain
@@ -64,8 +68,6 @@
NSSProfileFilterChromeOS profile_filter_;
crypto::ScopedPK11Slot system_slot_;
-
- DISALLOW_COPY_AND_ASSIGN(NSSCertDatabaseChromeOS);
};
} // namespace net
diff --git a/net/cert/pem.h b/net/cert/pem.h
index c964b1b..dff7e02 100644
--- a/net/cert/pem.h
+++ b/net/cert/pem.h
@@ -27,6 +27,10 @@
// |str| must remain valid for the duration of the PEMTokenizer.
PEMTokenizer(const base::StringPiece& str,
const std::vector<std::string>& allowed_block_types);
+
+ PEMTokenizer(const PEMTokenizer&) = delete;
+ PEMTokenizer& operator=(const PEMTokenizer&) = delete;
+
~PEMTokenizer();
// Attempts to decode the next PEM block in the string. Returns false if no
@@ -71,8 +75,6 @@
// The raw (Base64-decoded) data of the last successfully decoded block.
std::string data_;
-
- DISALLOW_COPY_AND_ASSIGN(PEMTokenizer);
};
// Encodes |data| in the encapsulated message format described in RFC 1421,
diff --git a/net/cert/test_root_certs.h b/net/cert/test_root_certs.h
index afac81c..16ae5bc 100644
--- a/net/cert/test_root_certs.h
+++ b/net/cert/test_root_certs.h
@@ -111,6 +111,10 @@
// TestRootCerts store (if there were existing roots they are
// cleared).
explicit ScopedTestRoot(CertificateList certs);
+
+ ScopedTestRoot(const ScopedTestRoot&) = delete;
+ ScopedTestRoot& operator=(const ScopedTestRoot&) = delete;
+
~ScopedTestRoot();
// Assigns |certs| to be the new test root certs. If |certs| is empty, undoes
@@ -122,8 +126,6 @@
private:
CertificateList certs_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedTestRoot);
};
} // namespace net
diff --git a/net/cert/trial_comparison_cert_verifier.cc b/net/cert/trial_comparison_cert_verifier.cc
index a8a4236..fdbf820 100644
--- a/net/cert/trial_comparison_cert_verifier.cc
+++ b/net/cert/trial_comparison_cert_verifier.cc
@@ -138,6 +138,10 @@
const CertVerifier::RequestParams& params,
const NetLogWithSource& source_net_log,
TrialComparisonCertVerifier* parent);
+
+ Job(const Job&) = delete;
+ Job& operator=(const Job&) = delete;
+
~Job();
// Start the Job, attempting first to verify with the parent's primary
@@ -221,8 +225,6 @@
std::unique_ptr<CertVerifier::Request> reverification_request_;
base::WeakPtrFactory<Job> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Job);
};
// The Request is vended to the TrialComparisonCertVerifier::Verify() callers,
@@ -238,6 +240,10 @@
Request(TrialComparisonCertVerifier::Job* parent,
CertVerifyResult* client_result,
CompletionOnceCallback client_callback);
+
+ Request(const Request&) = delete;
+ Request& operator=(const Request&) = delete;
+
~Request() override;
// Called when the Job has completed, and used to invoke the client
@@ -254,8 +260,6 @@
TrialComparisonCertVerifier::Job* parent_;
CertVerifyResult* client_result_;
CompletionOnceCallback client_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(Request);
};
TrialComparisonCertVerifier::Job::Job(const CertVerifier::Config& config,
diff --git a/net/cert/trial_comparison_cert_verifier.h b/net/cert/trial_comparison_cert_verifier.h
index e200b8f6..a3c6383 100644
--- a/net/cert/trial_comparison_cert_verifier.h
+++ b/net/cert/trial_comparison_cert_verifier.h
@@ -87,6 +87,10 @@
scoped_refptr<CertVerifyProc> trial_verify_proc,
ReportCallback report_callback);
+ TrialComparisonCertVerifier(const TrialComparisonCertVerifier&) = delete;
+ TrialComparisonCertVerifier& operator=(const TrialComparisonCertVerifier&) =
+ delete;
+
~TrialComparisonCertVerifier() override;
void set_trial_allowed(bool allowed) { allowed_ = allowed; }
@@ -130,8 +134,6 @@
std::set<std::unique_ptr<Job>, base::UniquePtrComparator> jobs_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TrialComparisonCertVerifier);
};
} // namespace net
diff --git a/net/cert/x509_util_mac.h b/net/cert/x509_util_mac.h
index eb9721c..c04ec95 100644
--- a/net/cert/x509_util_mac.h
+++ b/net/cert/x509_util_mac.h
@@ -109,6 +109,10 @@
CSSMFieldValue(CSSM_CL_HANDLE cl_handle,
const CSSM_OID* oid,
CSSM_DATA_PTR field);
+
+ CSSMFieldValue(const CSSMFieldValue&) = delete;
+ CSSMFieldValue& operator=(const CSSMFieldValue&) = delete;
+
~CSSMFieldValue();
CSSM_OID_PTR oid() const { return oid_; }
@@ -133,8 +137,6 @@
CSSM_CL_HANDLE cl_handle_;
CSSM_OID_PTR oid_;
CSSM_DATA_PTR field_;
-
- DISALLOW_COPY_AND_ASSIGN(CSSMFieldValue);
};
// CSSMCachedCertificate is a container class that is used to wrap the
diff --git a/net/cert_net/cert_net_fetcher_url_request.cc b/net/cert_net/cert_net_fetcher_url_request.cc
index 5579b3e..50f98e68 100644
--- a/net/cert_net/cert_net_fetcher_url_request.cc
+++ b/net/cert_net/cert_net_fetcher_url_request.cc
@@ -132,6 +132,10 @@
// Shutdown() is called or the AsyncCertNetFetcherURLRequest is destroyed.
explicit AsyncCertNetFetcherURLRequest(URLRequestContext* context);
+ AsyncCertNetFetcherURLRequest(const AsyncCertNetFetcherURLRequest&) = delete;
+ AsyncCertNetFetcherURLRequest& operator=(
+ const AsyncCertNetFetcherURLRequest&) = delete;
+
// The AsyncCertNetFetcherURLRequest is expected to be kept alive until all
// requests have completed or Shutdown() is called.
~AsyncCertNetFetcherURLRequest();
@@ -162,8 +166,6 @@
URLRequestContext* context_ = nullptr;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(AsyncCertNetFetcherURLRequest);
};
namespace {
@@ -318,6 +320,10 @@
public:
Job(std::unique_ptr<CertNetFetcherURLRequest::RequestParams> request_params,
CertNetFetcherURLRequest::AsyncCertNetFetcherURLRequest* parent);
+
+ Job(const Job&) = delete;
+ Job& operator=(const Job&) = delete;
+
~Job() override;
const CertNetFetcherURLRequest::RequestParams& request_params() const {
@@ -397,8 +403,6 @@
// Non-owned pointer to the AsyncCertNetFetcherURLRequest that created this
// job.
CertNetFetcherURLRequest::AsyncCertNetFetcherURLRequest* parent_;
-
- DISALLOW_COPY_AND_ASSIGN(Job);
};
} // namespace
diff --git a/net/cookies/cookie_access_delegate.h b/net/cookies/cookie_access_delegate.h
index 2c5715e..0dfba9e 100644
--- a/net/cookies/cookie_access_delegate.h
+++ b/net/cookies/cookie_access_delegate.h
@@ -21,6 +21,10 @@
class NET_EXPORT CookieAccessDelegate {
public:
CookieAccessDelegate();
+
+ CookieAccessDelegate(const CookieAccessDelegate&) = delete;
+ CookieAccessDelegate& operator=(const CookieAccessDelegate&) = delete;
+
virtual ~CookieAccessDelegate();
// Returns true if the passed in |url| should be permitted to access secure
@@ -60,9 +64,6 @@
// Returns the First-Party Sets.
virtual base::flat_map<net::SchemefulSite, std::set<net::SchemefulSite>>
RetrieveFirstPartySets() const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieAccessDelegate);
};
} // namespace net
diff --git a/net/cookies/cookie_change_dispatcher.h b/net/cookies/cookie_change_dispatcher.h
index ffa9a00..21d2d94 100644
--- a/net/cookies/cookie_change_dispatcher.h
+++ b/net/cookies/cookie_change_dispatcher.h
@@ -98,10 +98,11 @@
class CookieChangeSubscription {
public:
CookieChangeSubscription() = default;
- virtual ~CookieChangeSubscription() = default;
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieChangeSubscription);
+ CookieChangeSubscription(const CookieChangeSubscription&) = delete;
+ CookieChangeSubscription& operator=(const CookieChangeSubscription&) = delete;
+
+ virtual ~CookieChangeSubscription() = default;
};
// Exposes changes to a CookieStore's contents.
@@ -122,6 +123,10 @@
class CookieChangeDispatcher {
public:
CookieChangeDispatcher() = default;
+
+ CookieChangeDispatcher(const CookieChangeDispatcher&) = delete;
+ CookieChangeDispatcher& operator=(const CookieChangeDispatcher&) = delete;
+
virtual ~CookieChangeDispatcher() = default;
// Observe changes to all cookies named |name| that would be sent in a
@@ -142,9 +147,6 @@
// See kChangeCauseMapping in cookie_monster.cc for details.
virtual std::unique_ptr<CookieChangeSubscription> AddCallbackForAllChanges(
CookieChangeCallback callback) WARN_UNUSED_RESULT = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CookieChangeDispatcher);
};
} // namespace net
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
index 348b42aa..a1918c8 100644
--- a/net/cookies/cookie_monster.h
+++ b/net/cookies/cookie_monster.h
@@ -163,6 +163,9 @@
base::TimeDelta last_access_threshold,
NetLog* net_log);
+ CookieMonster(const CookieMonster&) = delete;
+ CookieMonster& operator=(const CookieMonster&) = delete;
+
~CookieMonster() override;
// Writes all the cookies in |list| into the store, replacing all cookies
@@ -754,8 +757,6 @@
base::ThreadChecker thread_checker_;
base::WeakPtrFactory<CookieMonster> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CookieMonster);
};
typedef base::RefCountedThreadSafe<CookieMonster::PersistentCookieStore>
diff --git a/net/cookies/cookie_monster_change_dispatcher.h b/net/cookies/cookie_monster_change_dispatcher.h
index c769efe9..c147120d 100644
--- a/net/cookies/cookie_monster_change_dispatcher.h
+++ b/net/cookies/cookie_monster_change_dispatcher.h
@@ -33,6 +33,11 @@
// Expects |cookie_monster| to outlive this.
explicit CookieMonsterChangeDispatcher(const CookieMonster* cookie_monster);
+
+ CookieMonsterChangeDispatcher(const CookieMonsterChangeDispatcher&) = delete;
+ CookieMonsterChangeDispatcher& operator=(
+ const CookieMonsterChangeDispatcher&) = delete;
+
~CookieMonsterChangeDispatcher() override;
// The key in CookieNameMap for a cookie name.
@@ -71,6 +76,9 @@
GURL url,
net::CookieChangeCallback callback);
+ Subscription(const Subscription&) = delete;
+ Subscription& operator=(const Subscription&) = delete;
+
~Subscription() override;
// The lookup key used in the domain subscription map.
@@ -103,8 +111,6 @@
// Used to cancel delayed calls to DoDispatchChange() when the subscription
// gets destroyed.
base::WeakPtrFactory<Subscription> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Subscription);
};
// The last level of the subscription data structures.
@@ -147,8 +153,6 @@
// Vends weak pointers to subscriptions.
base::WeakPtrFactory<CookieMonsterChangeDispatcher> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(CookieMonsterChangeDispatcher);
};
} // namespace net
diff --git a/net/cookies/cookie_store_test_helpers.h b/net/cookies/cookie_store_test_helpers.h
index 69fa31e..424f28ee 100644
--- a/net/cookies/cookie_store_test_helpers.h
+++ b/net/cookies/cookie_store_test_helpers.h
@@ -24,6 +24,12 @@
class DelayedCookieMonsterChangeDispatcher : public CookieChangeDispatcher {
public:
DelayedCookieMonsterChangeDispatcher();
+
+ DelayedCookieMonsterChangeDispatcher(
+ const DelayedCookieMonsterChangeDispatcher&) = delete;
+ DelayedCookieMonsterChangeDispatcher& operator=(
+ const DelayedCookieMonsterChangeDispatcher&) = delete;
+
~DelayedCookieMonsterChangeDispatcher() override;
// net::CookieChangeDispatcher
@@ -36,15 +42,15 @@
CookieChangeCallback callback) override WARN_UNUSED_RESULT;
std::unique_ptr<CookieChangeSubscription> AddCallbackForAllChanges(
CookieChangeCallback callback) override WARN_UNUSED_RESULT;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DelayedCookieMonsterChangeDispatcher);
};
class DelayedCookieMonster : public CookieStore {
public:
DelayedCookieMonster();
+ DelayedCookieMonster(const DelayedCookieMonster&) = delete;
+ DelayedCookieMonster& operator=(const DelayedCookieMonster&) = delete;
+
~DelayedCookieMonster() override;
// Call the asynchronous CookieMonster function, expect it to immediately
@@ -113,8 +119,6 @@
std::string cookie_line_;
CookieAccessResultList cookie_access_result_list_;
CookieList cookie_list_;
-
- DISALLOW_COPY_AND_ASSIGN(DelayedCookieMonster);
};
class CookieURLHelper {
diff --git a/net/cookies/parsed_cookie.h b/net/cookies/parsed_cookie.h
index 26c4b5c..86038f73 100644
--- a/net/cookies/parsed_cookie.h
+++ b/net/cookies/parsed_cookie.h
@@ -43,6 +43,10 @@
// is valid.
explicit ParsedCookie(const std::string& cookie_line,
CookieInclusionStatus* status_out = nullptr);
+
+ ParsedCookie(const ParsedCookie&) = delete;
+ ParsedCookie& operator=(const ParsedCookie&) = delete;
+
~ParsedCookie();
// You should not call any other methods except for SetName/SetValue on the
@@ -219,8 +223,6 @@
// For metrics on cookie name/value truncation. See usage at the bottom of
// `ParseTokenValuePairs()` for more details.
bool truncated_name_or_value_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(ParsedCookie);
};
} // namespace net
diff --git a/net/cookies/test_cookie_access_delegate.h b/net/cookies/test_cookie_access_delegate.h
index 8a0320e..d04e9e6a 100644
--- a/net/cookies/test_cookie_access_delegate.h
+++ b/net/cookies/test_cookie_access_delegate.h
@@ -22,6 +22,10 @@
class TestCookieAccessDelegate : public CookieAccessDelegate {
public:
TestCookieAccessDelegate();
+
+ TestCookieAccessDelegate(const TestCookieAccessDelegate&) = delete;
+ TestCookieAccessDelegate& operator=(const TestCookieAccessDelegate&) = delete;
+
~TestCookieAccessDelegate() override;
// CookieAccessDelegate implementation:
@@ -68,8 +72,6 @@
std::map<std::string, bool> ignore_samesite_restrictions_schemes_;
base::flat_map<net::SchemefulSite, std::set<net::SchemefulSite>>
first_party_sets_;
-
- DISALLOW_COPY_AND_ASSIGN(TestCookieAccessDelegate);
};
} // namespace net
diff --git a/net/disk_cache/blockfile/backend_impl.h b/net/disk_cache/blockfile/backend_impl.h
index e89264a1..2e4f908 100644
--- a/net/disk_cache/blockfile/backend_impl.h
+++ b/net/disk_cache/blockfile/backend_impl.h
@@ -67,6 +67,9 @@
net::CacheType cache_type,
net::NetLog* net_log);
+ BackendImpl(const BackendImpl&) = delete;
+ BackendImpl& operator=(const BackendImpl&) = delete;
+
~BackendImpl() override;
// Performs general initialization for this current instance of the cache.
@@ -424,8 +427,6 @@
Stats stats_; // Usage statistics.
std::unique_ptr<base::RepeatingTimer> timer_; // Usage timer.
base::WeakPtrFactory<BackendImpl> ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BackendImpl);
};
} // namespace disk_cache
diff --git a/net/disk_cache/blockfile/bitmap.h b/net/disk_cache/blockfile/bitmap.h
index bc9af80..980bfe1 100644
--- a/net/disk_cache/blockfile/bitmap.h
+++ b/net/disk_cache/blockfile/bitmap.h
@@ -27,6 +27,9 @@
// bits in the bitmap, and |num_words| is the size of |map| in 32-bit words.
Bitmap(uint32_t* map, int num_bits, int num_words);
+ Bitmap(const Bitmap&) = delete;
+ Bitmap& operator=(const Bitmap&) = delete;
+
~Bitmap();
// Resizes the bitmap.
@@ -130,8 +133,6 @@
int num_bits_; // The upper bound of the bitmap.
int array_size_; // The physical size (in uint32s) of the bitmap.
bool alloc_; // Whether or not we allocated the memory.
-
- DISALLOW_COPY_AND_ASSIGN(Bitmap);
};
} // namespace disk_cache
diff --git a/net/disk_cache/blockfile/block_files.h b/net/disk_cache/blockfile/block_files.h
index 944d55e2..a804216 100644
--- a/net/disk_cache/blockfile/block_files.h
+++ b/net/disk_cache/blockfile/block_files.h
@@ -94,6 +94,10 @@
class NET_EXPORT_PRIVATE BlockFiles {
public:
explicit BlockFiles(const base::FilePath& path);
+
+ BlockFiles(const BlockFiles&) = delete;
+ BlockFiles& operator=(const BlockFiles&) = delete;
+
~BlockFiles();
// Performs the object initialization. create_files indicates if the backing
@@ -157,8 +161,6 @@
FRIEND_TEST_ALL_PREFIXES(DiskCacheTest, BlockFiles_TruncatedFile);
FRIEND_TEST_ALL_PREFIXES(DiskCacheTest, BlockFiles_InvalidFile);
FRIEND_TEST_ALL_PREFIXES(DiskCacheTest, BlockFiles_Stats);
-
- DISALLOW_COPY_AND_ASSIGN(BlockFiles);
};
} // namespace disk_cache
diff --git a/net/disk_cache/blockfile/entry_impl.cc b/net/disk_cache/blockfile/entry_impl.cc
index 1dc20bb..f35b1fa 100644
--- a/net/disk_cache/blockfile/entry_impl.cc
+++ b/net/disk_cache/blockfile/entry_impl.cc
@@ -53,6 +53,10 @@
end_event_type_(end_event_type) {
entry_->IncrementIoCount();
}
+
+ SyncCallback(const SyncCallback&) = delete;
+ SyncCallback& operator=(const SyncCallback&) = delete;
+
~SyncCallback() override = default;
void OnFileIOComplete(int bytes_copied) override;
@@ -64,8 +68,6 @@
scoped_refptr<net::IOBuffer> buf_;
TimeTicks start_;
const net::NetLogEventType end_event_type_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncCallback);
};
void SyncCallback::OnFileIOComplete(int bytes_copied) {
@@ -106,6 +108,10 @@
: backend_(backend->GetWeakPtr()), offset_(0), grow_allowed_(true) {
buffer_.reserve(kMaxBlockSize);
}
+
+ UserBuffer(const UserBuffer&) = delete;
+ UserBuffer& operator=(const UserBuffer&) = delete;
+
~UserBuffer() {
if (backend_.get())
backend_->BufferDeleted(capacity() - kMaxBlockSize);
@@ -145,7 +151,6 @@
int offset_;
std::vector<char> buffer_;
bool grow_allowed_;
- DISALLOW_COPY_AND_ASSIGN(UserBuffer);
};
bool EntryImpl::UserBuffer::PreWrite(int offset, int len) {
diff --git a/net/disk_cache/blockfile/eviction.h b/net/disk_cache/blockfile/eviction.h
index 283463f..c4a5af1 100644
--- a/net/disk_cache/blockfile/eviction.h
+++ b/net/disk_cache/blockfile/eviction.h
@@ -20,6 +20,10 @@
class Eviction {
public:
Eviction();
+
+ Eviction(const Eviction&) = delete;
+ Eviction& operator=(const Eviction&) = delete;
+
~Eviction();
void Init(BackendImpl* backend);
@@ -82,8 +86,6 @@
bool init_;
bool test_mode_;
base::WeakPtrFactory<Eviction> ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Eviction);
};
} // namespace disk_cache
diff --git a/net/disk_cache/blockfile/file_ios.cc b/net/disk_cache/blockfile/file_ios.cc
index c6f81c3f..d287d86a 100644
--- a/net/disk_cache/blockfile/file_ios.cc
+++ b/net/disk_cache/blockfile/file_ios.cc
@@ -72,6 +72,10 @@
class FileInFlightIO : public disk_cache::InFlightIO {
public:
FileInFlightIO() {}
+
+ FileInFlightIO(const FileInFlightIO&) = delete;
+ FileInFlightIO& operator=(const FileInFlightIO&) = delete;
+
~FileInFlightIO() override {}
// These methods start an asynchronous operation. The arguments have the same
@@ -89,9 +93,6 @@
// the one performing the call.
void OnOperationComplete(disk_cache::BackgroundIO* operation,
bool cancel) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FileInFlightIO);
};
// ---------------------------------------------------------------------------
diff --git a/net/disk_cache/blockfile/in_flight_backend_io.h b/net/disk_cache/blockfile/in_flight_backend_io.h
index a84a2e3e..ea107a1 100644
--- a/net/disk_cache/blockfile/in_flight_backend_io.h
+++ b/net/disk_cache/blockfile/in_flight_backend_io.h
@@ -190,6 +190,10 @@
InFlightBackendIO(
BackendImpl* backend,
const scoped_refptr<base::SingleThreadTaskRunner>& background_thread);
+
+ InFlightBackendIO(const InFlightBackendIO&) = delete;
+ InFlightBackendIO& operator=(const InFlightBackendIO&) = delete;
+
~InFlightBackendIO() override;
// Proxied operations.
@@ -265,8 +269,6 @@
BackendImpl* backend_;
scoped_refptr<base::SingleThreadTaskRunner> background_thread_;
base::WeakPtrFactory<InFlightBackendIO> ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(InFlightBackendIO);
};
} // namespace disk_cache
diff --git a/net/disk_cache/blockfile/in_flight_io.h b/net/disk_cache/blockfile/in_flight_io.h
index 9ab2176..26c4e32 100644
--- a/net/disk_cache/blockfile/in_flight_io.h
+++ b/net/disk_cache/blockfile/in_flight_io.h
@@ -96,6 +96,10 @@
class InFlightIO {
public:
InFlightIO();
+
+ InFlightIO(const InFlightIO&) = delete;
+ InFlightIO& operator=(const InFlightIO&) = delete;
+
virtual ~InFlightIO();
// Blocks the current thread until all IO operations tracked by this object
@@ -135,8 +139,6 @@
#if DCHECK_IS_ON()
bool single_thread_ = false; // True if we only have one thread.
#endif
-
- DISALLOW_COPY_AND_ASSIGN(InFlightIO);
};
} // namespace disk_cache
diff --git a/net/disk_cache/blockfile/rankings.cc b/net/disk_cache/blockfile/rankings.cc
index b4feb03dd..79e3c88 100644
--- a/net/disk_cache/blockfile/rankings.cc
+++ b/net/disk_cache/blockfile/rankings.cc
@@ -55,10 +55,13 @@
// volatile is not enough for that, but it should be a good hint.
Transaction(volatile disk_cache::LruData* data, disk_cache::Addr addr,
Operation op, int list);
+
+ Transaction(const Transaction&) = delete;
+ Transaction& operator=(const Transaction&) = delete;
+
~Transaction();
private:
volatile disk_cache::LruData* data_;
- DISALLOW_COPY_AND_ASSIGN(Transaction);
};
Transaction::Transaction(volatile disk_cache::LruData* data,
diff --git a/net/disk_cache/blockfile/rankings.h b/net/disk_cache/blockfile/rankings.h
index d64f921f..53fa611 100644
--- a/net/disk_cache/blockfile/rankings.h
+++ b/net/disk_cache/blockfile/rankings.h
@@ -72,6 +72,9 @@
explicit ScopedRankingsBlock(Rankings* rankings);
ScopedRankingsBlock(Rankings* rankings, CacheRankingsBlock* node);
+ ScopedRankingsBlock(const ScopedRankingsBlock&) = delete;
+ ScopedRankingsBlock& operator=(const ScopedRankingsBlock&) = delete;
+
~ScopedRankingsBlock() {
rankings_->FreeRankingsBlock(get());
}
@@ -89,7 +92,6 @@
private:
Rankings* rankings_;
- DISALLOW_COPY_AND_ASSIGN(ScopedRankingsBlock);
};
// If we have multiple lists, we have to iterate through all at the same time.
diff --git a/net/disk_cache/blockfile/sparse_control.h b/net/disk_cache/blockfile/sparse_control.h
index ebd6c91..b2355b92 100644
--- a/net/disk_cache/blockfile/sparse_control.h
+++ b/net/disk_cache/blockfile/sparse_control.h
@@ -44,6 +44,10 @@
};
explicit SparseControl(EntryImpl* entry);
+
+ SparseControl(const SparseControl&) = delete;
+ SparseControl& operator=(const SparseControl&) = delete;
+
~SparseControl();
// Initializes the object for the current entry. If this entry already stores
@@ -173,8 +177,6 @@
int child_offset_; // Offset to use for the current child.
int child_len_; // Bytes to read or write for this child.
int result_;
-
- DISALLOW_COPY_AND_ASSIGN(SparseControl);
};
} // namespace disk_cache
diff --git a/net/disk_cache/blockfile/stats.h b/net/disk_cache/blockfile/stats.h
index c469b26..78fb150 100644
--- a/net/disk_cache/blockfile/stats.h
+++ b/net/disk_cache/blockfile/stats.h
@@ -49,6 +49,10 @@
};
Stats();
+
+ Stats(const Stats&) = delete;
+ Stats& operator=(const Stats&) = delete;
+
~Stats();
// Initializes this object with |data| from disk.
@@ -89,8 +93,6 @@
Addr storage_addr_;
int data_sizes_[kDataSizesLength];
int64_t counters_[MAX_COUNTER];
-
- DISALLOW_COPY_AND_ASSIGN(Stats);
};
} // namespace disk_cache
diff --git a/net/disk_cache/blockfile/storage_block.h b/net/disk_cache/blockfile/storage_block.h
index 661a21e2..679eb883 100644
--- a/net/disk_cache/blockfile/storage_block.h
+++ b/net/disk_cache/blockfile/storage_block.h
@@ -35,6 +35,10 @@
class StorageBlock : public FileBlock {
public:
StorageBlock(MappedFile* file, Addr address);
+
+ StorageBlock(const StorageBlock&) = delete;
+ StorageBlock& operator=(const StorageBlock&) = delete;
+
virtual ~StorageBlock();
// Deeps copies from another block. Neither this nor |other| should be
@@ -96,8 +100,6 @@
bool modified_;
bool own_data_; // Is data_ owned by this object or shared with someone else.
bool extended_; // Used to store an entry of more than one block.
-
- DISALLOW_COPY_AND_ASSIGN(StorageBlock);
};
} // namespace disk_cache
diff --git a/net/disk_cache/disk_cache_test_util.h b/net/disk_cache/disk_cache_test_util.h
index f7e2fa7..8428cb7eb 100644
--- a/net/disk_cache/disk_cache_test_util.h
+++ b/net/disk_cache/disk_cache_test_util.h
@@ -54,12 +54,15 @@
: public TestEntryResultCompletionCallbackBase {
public:
TestEntryResultCompletionCallback();
+
+ TestEntryResultCompletionCallback(const TestEntryResultCompletionCallback&) =
+ delete;
+ TestEntryResultCompletionCallback& operator=(
+ const TestEntryResultCompletionCallback&) = delete;
+
~TestEntryResultCompletionCallback() override;
disk_cache::Backend::EntryResultCallback callback();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestEntryResultCompletionCallback);
};
// Like net::TestCompletionCallback, but for RangeResultCallback.
@@ -91,6 +94,10 @@
class MessageLoopHelper {
public:
MessageLoopHelper();
+
+ MessageLoopHelper(const MessageLoopHelper&) = delete;
+ MessageLoopHelper& operator=(const MessageLoopHelper&) = delete;
+
~MessageLoopHelper();
// Run the message loop and wait for num_callbacks before returning. Returns
@@ -130,8 +137,6 @@
// True if a callback was called/reused more than expected.
bool callback_reused_error_;
int callbacks_called_;
-
- DISALLOW_COPY_AND_ASSIGN(MessageLoopHelper);
};
// -----------------------------------------------------------------------
@@ -145,6 +150,10 @@
// once, or if |reuse| is true and a callback is called more than twice, an
// error will be reported to |helper|.
CallbackTest(MessageLoopHelper* helper, bool reuse);
+
+ CallbackTest(const CallbackTest&) = delete;
+ CallbackTest& operator=(const CallbackTest&) = delete;
+
~CallbackTest();
void Run(int result);
@@ -160,7 +169,6 @@
int reuse_;
int last_result_;
disk_cache::EntryResult last_entry_result_;
- DISALLOW_COPY_AND_ASSIGN(CallbackTest);
};
#endif // NET_DISK_CACHE_DISK_CACHE_TEST_UTIL_H_
diff --git a/net/disk_cache/memory/mem_backend_impl.h b/net/disk_cache/memory/mem_backend_impl.h
index b5bb3164..d4dc597 100644
--- a/net/disk_cache/memory/mem_backend_impl.h
+++ b/net/disk_cache/memory/mem_backend_impl.h
@@ -39,6 +39,10 @@
class NET_EXPORT_PRIVATE MemBackendImpl final : public Backend {
public:
explicit MemBackendImpl(net::NetLog* net_log);
+
+ MemBackendImpl(const MemBackendImpl&) = delete;
+ MemBackendImpl& operator=(const MemBackendImpl&) = delete;
+
~MemBackendImpl() override;
// Returns an instance of a Backend implemented only in memory. The returned
@@ -153,8 +157,6 @@
base::MemoryPressureListener memory_pressure_listener_;
base::WeakPtrFactory<MemBackendImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MemBackendImpl);
};
} // namespace disk_cache
diff --git a/net/disk_cache/simple/simple_file_tracker.h b/net/disk_cache/simple/simple_file_tracker.h
index d47ab03..a54e42f 100644
--- a/net/disk_cache/simple/simple_file_tracker.h
+++ b/net/disk_cache/simple/simple_file_tracker.h
@@ -46,6 +46,10 @@
public:
FileHandle();
FileHandle(FileHandle&& other);
+
+ FileHandle(const FileHandle&) = delete;
+ FileHandle& operator=(const FileHandle&) = delete;
+
~FileHandle();
FileHandle& operator=(FileHandle&& other);
base::File* operator->() const;
@@ -67,7 +71,6 @@
const SimpleSynchronousEntry* entry_ = nullptr;
SimpleFileTracker::SubFile subfile_;
base::File* file_ = nullptr;
- DISALLOW_COPY_AND_ASSIGN(FileHandle);
};
struct EntryFileKey {
diff --git a/net/dns/address_info.h b/net/dns/address_info.h
index 93de572..f5a0124 100644
--- a/net/dns/address_info.h
+++ b/net/dns/address_info.h
@@ -84,14 +84,16 @@
class NET_EXPORT_PRIVATE AddrInfoGetter {
public:
AddrInfoGetter();
+
+ AddrInfoGetter(const AddrInfoGetter&) = delete;
+ AddrInfoGetter& operator=(const AddrInfoGetter&) = delete;
+
// Virtual for tests.
virtual ~AddrInfoGetter();
virtual addrinfo* getaddrinfo(const std::string& host,
const addrinfo* hints,
int* out_os_error);
virtual void freeaddrinfo(addrinfo* ai);
-
- DISALLOW_COPY_AND_ASSIGN(AddrInfoGetter);
};
} // namespace net
diff --git a/net/dns/address_sorter.h b/net/dns/address_sorter.h
index 2af2ee2..95fe5e1 100644
--- a/net/dns/address_sorter.h
+++ b/net/dns/address_sorter.h
@@ -24,6 +24,9 @@
using CallbackType =
base::OnceCallback<void(bool success, const AddressList& list)>;
+ AddressSorter(const AddressSorter&) = delete;
+ AddressSorter& operator=(const AddressSorter&) = delete;
+
virtual ~AddressSorter() {}
// Sorts |list|, which must include at least one IPv6 address.
@@ -36,9 +39,6 @@
protected:
AddressSorter() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(AddressSorter);
};
} // namespace net
diff --git a/net/dns/address_sorter_posix.h b/net/dns/address_sorter_posix.h
index 81420f3..61a59bd6 100644
--- a/net/dns/address_sorter_posix.h
+++ b/net/dns/address_sorter_posix.h
@@ -60,6 +60,10 @@
typedef std::map<IPAddress, SourceAddressInfo> SourceAddressMap;
explicit AddressSorterPosix(ClientSocketFactory* socket_factory);
+
+ AddressSorterPosix(const AddressSorterPosix&) = delete;
+ AddressSorterPosix& operator=(const AddressSorterPosix&) = delete;
+
~AddressSorterPosix() override;
// AddressSorter:
@@ -84,8 +88,6 @@
PolicyTable ipv4_scope_table_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(AddressSorterPosix);
};
} // namespace net
diff --git a/net/dns/address_sorter_posix_unittest.cc b/net/dns/address_sorter_posix_unittest.cc
index a96abce2..95139f6 100644
--- a/net/dns/address_sorter_posix_unittest.cc
+++ b/net/dns/address_sorter_posix_unittest.cc
@@ -42,6 +42,9 @@
explicit TestUDPClientSocket(const AddressMapping* mapping)
: mapping_(mapping), connected_(false) {}
+ TestUDPClientSocket(const TestUDPClientSocket&) = delete;
+ TestUDPClientSocket& operator=(const TestUDPClientSocket&) = delete;
+
~TestUDPClientSocket() override = default;
int Read(IOBuffer*, int, CompletionOnceCallback) override {
@@ -135,14 +138,16 @@
const AddressMapping* mapping_;
bool connected_;
IPEndPoint local_endpoint_;
-
- DISALLOW_COPY_AND_ASSIGN(TestUDPClientSocket);
};
// Creates TestUDPClientSockets and maintains an AddressMapping.
class TestSocketFactory : public ClientSocketFactory {
public:
TestSocketFactory() = default;
+
+ TestSocketFactory(const TestSocketFactory&) = delete;
+ TestSocketFactory& operator=(const TestSocketFactory&) = delete;
+
~TestSocketFactory() override = default;
std::unique_ptr<DatagramClientSocket> CreateDatagramClientSocket(
@@ -189,8 +194,6 @@
private:
AddressMapping mapping_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSocketFactory);
};
void OnSortComplete(AddressList* result_buf,
diff --git a/net/dns/address_sorter_win.cc b/net/dns/address_sorter_win.cc
index df64706b..524ba713 100644
--- a/net/dns/address_sorter_win.cc
+++ b/net/dns/address_sorter_win.cc
@@ -30,6 +30,9 @@
EnsureWinsockInit();
}
+ AddressSorterWin(const AddressSorterWin&) = delete;
+ AddressSorterWin& operator=(const AddressSorterWin&) = delete;
+
~AddressSorterWin() override {}
// AddressSorter:
@@ -137,8 +140,6 @@
DISALLOW_COPY_AND_ASSIGN(Job);
};
-
- DISALLOW_COPY_AND_ASSIGN(AddressSorterWin);
};
} // namespace
diff --git a/net/dns/context_host_resolver.h b/net/dns/context_host_resolver.h
index eed4048..e7f9082b 100644
--- a/net/dns/context_host_resolver.h
+++ b/net/dns/context_host_resolver.h
@@ -44,6 +44,10 @@
// Same except the created resolver will own its own HostResolverManager.
ContextHostResolver(std::unique_ptr<HostResolverManager> owned_manager,
std::unique_ptr<ResolveContext> resolve_context);
+
+ ContextHostResolver(const ContextHostResolver&) = delete;
+ ContextHostResolver& operator=(const ContextHostResolver&) = delete;
+
~ContextHostResolver() override;
// HostResolver methods:
@@ -103,8 +107,6 @@
bool shutting_down_ = false;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ContextHostResolver);
};
} // namespace net
diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc
index 486581f1..519b162 100644
--- a/net/dns/dns_client.cc
+++ b/net/dns/dns_client.cc
@@ -92,6 +92,9 @@
socket_factory_(socket_factory),
rand_int_callback_(rand_int_callback) {}
+ DnsClientImpl(const DnsClientImpl&) = delete;
+ DnsClientImpl& operator=(const DnsClientImpl&) = delete;
+
~DnsClientImpl() override = default;
bool CanUseSecureDnsTransactions() const override {
@@ -281,8 +284,6 @@
ClientSocketFactory* socket_factory_;
const RandIntCallback rand_int_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(DnsClientImpl);
};
} // namespace
diff --git a/net/dns/dns_config_service.h b/net/dns/dns_config_service.h
index e0103146..54b3efd 100644
--- a/net/dns/dns_config_service.h
+++ b/net/dns/dns_config_service.h
@@ -51,6 +51,10 @@
base::FilePath::StringPieceType hosts_file_path,
absl::optional<base::TimeDelta> config_change_delay =
base::TimeDelta::FromMilliseconds(50));
+
+ DnsConfigService(const DnsConfigService&) = delete;
+ DnsConfigService& operator=(const DnsConfigService&) = delete;
+
virtual ~DnsConfigService();
// Attempts to read the configuration. Will run |callback| when succeeded.
@@ -209,8 +213,6 @@
base::OneShotTimer timer_;
base::WeakPtrFactory<DnsConfigService> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DnsConfigService);
};
} // namespace net
diff --git a/net/dns/dns_config_service_fuchsia.h b/net/dns/dns_config_service_fuchsia.h
index 69b5ed3..7b99d3a4 100644
--- a/net/dns/dns_config_service_fuchsia.h
+++ b/net/dns/dns_config_service_fuchsia.h
@@ -17,6 +17,10 @@
class NET_EXPORT_PRIVATE DnsConfigServiceFuchsia : public DnsConfigService {
public:
DnsConfigServiceFuchsia();
+
+ DnsConfigServiceFuchsia(const DnsConfigServiceFuchsia&) = delete;
+ DnsConfigServiceFuchsia& operator=(const DnsConfigServiceFuchsia&) = delete;
+
~DnsConfigServiceFuchsia() override;
protected:
@@ -24,9 +28,6 @@
void ReadConfigNow() override;
void ReadHostsNow() override;
bool StartWatching() override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DnsConfigServiceFuchsia);
};
} // namespace internal
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
index 2de1457..b18f1232 100644
--- a/net/dns/dns_config_service_posix.cc
+++ b/net/dns/dns_config_service_posix.cc
@@ -132,6 +132,10 @@
public:
explicit Watcher(DnsConfigServicePosix& service)
: DnsConfigService::Watcher(service) {}
+
+ Watcher(const Watcher&) = delete;
+ Watcher& operator=(const Watcher&) = delete;
+
~Watcher() override = default;
bool Watch() override {
@@ -168,8 +172,6 @@
#if !defined(OS_IOS)
base::FilePathWatcher hosts_watcher_;
#endif // !defined(OS_IOS)
-
- DISALLOW_COPY_AND_ASSIGN(Watcher);
};
// A SerialWorker that uses libresolv to initialize res_state and converts
diff --git a/net/dns/dns_config_service_posix.h b/net/dns/dns_config_service_posix.h
index d59134e..cf13593 100644
--- a/net/dns/dns_config_service_posix.h
+++ b/net/dns/dns_config_service_posix.h
@@ -33,6 +33,10 @@
class NET_EXPORT_PRIVATE DnsConfigServicePosix : public DnsConfigService {
public:
DnsConfigServicePosix();
+
+ DnsConfigServicePosix(const DnsConfigServicePosix&) = delete;
+ DnsConfigServicePosix& operator=(const DnsConfigServicePosix&) = delete;
+
~DnsConfigServicePosix() override;
void RefreshConfig() override;
@@ -53,8 +57,6 @@
std::unique_ptr<Watcher> watcher_;
scoped_refptr<ConfigReader> config_reader_;
-
- DISALLOW_COPY_AND_ASSIGN(DnsConfigServicePosix);
};
// Returns nullopt iff a valid config could not be determined.
diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc
index b6f751bb..6f15a9a 100644
--- a/net/dns/dns_config_service_win.cc
+++ b/net/dns/dns_config_service_win.cc
@@ -79,6 +79,9 @@
key_.Open(HKEY_LOCAL_MACHINE, key, KEY_QUERY_VALUE);
}
+ RegistryReader(const RegistryReader&) = delete;
+ RegistryReader& operator=(const RegistryReader&) = delete;
+
~RegistryReader() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); }
absl::optional<DnsSystemSettings::RegString> ReadString(
@@ -127,8 +130,6 @@
base::win::RegKey key_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(RegistryReader);
};
// Wrapper for GetAdaptersAddresses. Returns NULL if failed.
@@ -321,6 +322,9 @@
typedef base::RepeatingCallback<void(bool succeeded)> CallbackType;
RegistryWatcher() {}
+ RegistryWatcher(const RegistryWatcher&) = delete;
+ RegistryWatcher& operator=(const RegistryWatcher&) = delete;
+
~RegistryWatcher() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); }
bool Watch(const wchar_t key[], const CallbackType& callback) {
@@ -352,8 +356,6 @@
base::win::RegKey key_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(RegistryWatcher);
};
// Returns true iff |address| is DNS address from IPv6 stateless discovery,
@@ -626,6 +628,10 @@
public:
explicit Watcher(DnsConfigServiceWin& service)
: DnsConfigService::Watcher(service) {}
+
+ Watcher(const Watcher&) = delete;
+ Watcher& operator=(const Watcher&) = delete;
+
~Watcher() override { NetworkChangeNotifier::RemoveIPAddressObserver(this); }
bool Watch() override {
@@ -685,8 +691,6 @@
RegistryWatcher dnscache_watcher_;
RegistryWatcher policy_watcher_;
base::FilePathWatcher hosts_watcher_;
-
- DISALLOW_COPY_AND_ASSIGN(Watcher);
};
// Reads config from registry and IpHelper. All work performed in ThreadPool.
diff --git a/net/dns/dns_config_service_win.h b/net/dns/dns_config_service_win.h
index 566f7e4..ce7a542 100644
--- a/net/dns/dns_config_service_win.h
+++ b/net/dns/dns_config_service_win.h
@@ -128,6 +128,10 @@
class NET_EXPORT_PRIVATE DnsConfigServiceWin : public DnsConfigService {
public:
DnsConfigServiceWin();
+
+ DnsConfigServiceWin(const DnsConfigServiceWin&) = delete;
+ DnsConfigServiceWin& operator=(const DnsConfigServiceWin&) = delete;
+
~DnsConfigServiceWin() override;
private:
@@ -143,8 +147,6 @@
std::unique_ptr<Watcher> watcher_;
scoped_refptr<ConfigReader> config_reader_;
scoped_refptr<HostsReader> hosts_reader_;
-
- DISALLOW_COPY_AND_ASSIGN(DnsConfigServiceWin);
};
} // namespace internal
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
index 160f945f..2515881 100644
--- a/net/dns/dns_transaction.cc
+++ b/net/dns/dns_transaction.cc
@@ -139,6 +139,9 @@
public:
explicit DnsAttempt(size_t server_index) : server_index_(server_index) {}
+ DnsAttempt(const DnsAttempt&) = delete;
+ DnsAttempt& operator=(const DnsAttempt&) = delete;
+
virtual ~DnsAttempt() = default;
// Starts the attempt. Returns ERR_IO_PENDING if cannot complete synchronously
// and calls |callback| upon completion.
@@ -188,8 +191,6 @@
private:
const size_t server_index_;
-
- DISALLOW_COPY_AND_ASSIGN(DnsAttempt);
};
class DnsUDPAttempt : public DnsAttempt {
@@ -1105,6 +1106,9 @@
DCHECK(!IsIPLiteral(hostname_));
}
+ DnsTransactionImpl(const DnsTransactionImpl&) = delete;
+ DnsTransactionImpl& operator=(const DnsTransactionImpl&) = delete;
+
~DnsTransactionImpl() override {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
if (!callback_.is_null()) {
@@ -1671,8 +1675,6 @@
RequestPriority request_priority_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(DnsTransactionImpl);
};
// ----------------------------------------------------------------------------
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
index 1dc6a71..26752aa 100644
--- a/net/dns/dns_transaction_unittest.cc
+++ b/net/dns/dns_transaction_unittest.cc
@@ -126,6 +126,10 @@
query_->io_buffer()->size(),
num_reads_and_writes()));
}
+
+ DnsSocketData(const DnsSocketData&) = delete;
+ DnsSocketData& operator=(const DnsSocketData&) = delete;
+
~DnsSocketData() = default;
// All responses must be added before GetProvider.
@@ -222,8 +226,6 @@
std::vector<MockWrite> writes_;
std::vector<MockRead> reads_;
std::unique_ptr<SequencedSocketData> provider_;
-
- DISALLOW_COPY_AND_ASSIGN(DnsSocketData);
};
class TestSocketFactory;
@@ -233,13 +235,14 @@
public:
FailingUDPClientSocket(SocketDataProvider* data, net::NetLog* net_log)
: MockUDPClientSocket(data, net_log) {}
+
+ FailingUDPClientSocket(const FailingUDPClientSocket&) = delete;
+ FailingUDPClientSocket& operator=(const FailingUDPClientSocket&) = delete;
+
~FailingUDPClientSocket() override = default;
int Connect(const IPEndPoint& endpoint) override {
return ERR_CONNECTION_REFUSED;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FailingUDPClientSocket);
};
// A variant of MockUDPClientSocket which notifies the factory OnConnect.
@@ -249,13 +252,15 @@
SocketDataProvider* data,
net::NetLog* net_log)
: MockUDPClientSocket(data, net_log), factory_(factory) {}
+
+ TestUDPClientSocket(const TestUDPClientSocket&) = delete;
+ TestUDPClientSocket& operator=(const TestUDPClientSocket&) = delete;
+
~TestUDPClientSocket() override = default;
int Connect(const IPEndPoint& endpoint) override;
private:
TestSocketFactory* factory_;
-
- DISALLOW_COPY_AND_ASSIGN(TestUDPClientSocket);
};
// Creates TestUDPClientSockets and keeps endpoints reported via OnConnect.
@@ -497,6 +502,9 @@
weak_factory_.GetWeakPtr()));
}
+ URLRequestMockDohJob(const URLRequestMockDohJob&) = delete;
+ URLRequestMockDohJob& operator=(const URLRequestMockDohJob&) = delete;
+
~URLRequestMockDohJob() override {
if (data_provider_)
data_provider_->DetachSocket();
@@ -586,8 +594,6 @@
int pending_buf_size_;
base::WeakPtrFactory<URLRequestMockDohJob> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestMockDohJob);
};
class DnsTransactionTestBase : public testing::Test {
@@ -861,6 +867,10 @@
class DohJobInterceptor : public URLRequestInterceptor {
public:
explicit DohJobInterceptor(DnsTransactionTestBase* test) : test_(test) {}
+
+ DohJobInterceptor(const DohJobInterceptor&) = delete;
+ DohJobInterceptor& operator=(const DohJobInterceptor&) = delete;
+
~DohJobInterceptor() override {}
// URLRequestInterceptor implementation:
@@ -871,8 +881,6 @@
private:
DnsTransactionTestBase* test_;
-
- DISALLOW_COPY_AND_ASSIGN(DohJobInterceptor);
};
void SetResponseModifierCallback(ResponseModifierCallback response_modifier) {
diff --git a/net/dns/fuzzed_host_resolver_util.cc b/net/dns/fuzzed_host_resolver_util.cc
index 18a797d6..8a8328b 100644
--- a/net/dns/fuzzed_host_resolver_util.cc
+++ b/net/dns/fuzzed_host_resolver_util.cc
@@ -393,6 +393,10 @@
HostResolverManager::SetDnsClientForTesting(std::move(dns_client));
}
+ FuzzedHostResolverManager(const FuzzedHostResolverManager&) = delete;
+ FuzzedHostResolverManager& operator=(const FuzzedHostResolverManager&) =
+ delete;
+
~FuzzedHostResolverManager() override = default;
void SetDnsClientForTesting(std::unique_ptr<DnsClient> dns_client) {
@@ -424,8 +428,6 @@
NetLog* const net_log_;
base::WeakPtrFactory<FuzzedDataProvider> data_provider_weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(FuzzedHostResolverManager);
};
} // namespace
diff --git a/net/dns/host_cache.h b/net/dns/host_cache.h
index f4f8ba9..410b23a 100644
--- a/net/dns/host_cache.h
+++ b/net/dns/host_cache.h
@@ -321,6 +321,9 @@
// Constructs a HostCache that stores up to |max_entries|.
explicit HostCache(size_t max_entries);
+ HostCache(const HostCache&) = delete;
+ HostCache& operator=(const HostCache&) = delete;
+
~HostCache();
// Returns a pointer to the matching (key, entry) pair, which is valid at time
@@ -452,8 +455,6 @@
const base::TickClock* tick_clock_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(HostCache);
};
} // namespace net
diff --git a/net/dns/host_resolver.cc b/net/dns/host_resolver.cc
index 6f5be0a..537e3183 100644
--- a/net/dns/host_resolver.cc
+++ b/net/dns/host_resolver.cc
@@ -35,6 +35,10 @@
public HostResolver::ProbeRequest {
public:
explicit FailingRequestImpl(int error) : error_(error) {}
+
+ FailingRequestImpl(const FailingRequestImpl&) = delete;
+ FailingRequestImpl& operator=(const FailingRequestImpl&) = delete;
+
~FailingRequestImpl() override = default;
int Start(CompletionOnceCallback callback) override { return error_; }
@@ -78,8 +82,6 @@
private:
const int error_;
-
- DISALLOW_COPY_AND_ASSIGN(FailingRequestImpl);
};
} // namespace
diff --git a/net/dns/host_resolver.h b/net/dns/host_resolver.h
index 339182f..4eb2504 100644
--- a/net/dns/host_resolver.h
+++ b/net/dns/host_resolver.h
@@ -310,6 +310,9 @@
virtual int Start(Delegate* delegate) = 0;
};
+ HostResolver(const HostResolver&) = delete;
+ HostResolver& operator=(const HostResolver&) = delete;
+
// If any completion callbacks are pending when the resolver is destroyed,
// the host resolutions are cancelled, and the completion callbacks will not
// be called.
@@ -406,9 +409,6 @@
// immediately on start.
static std::unique_ptr<ResolveHostRequest> CreateFailingRequest(int error);
static std::unique_ptr<ProbeRequest> CreateFailingProbeRequest(int error);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HostResolver);
};
} // namespace net
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
index dbfcc7151..05a769b3 100644
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -666,6 +666,9 @@
complete_(false),
tick_clock_(tick_clock) {}
+ RequestImpl(const RequestImpl&) = delete;
+ RequestImpl& operator=(const RequestImpl&) = delete;
+
~RequestImpl() override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
Cancel();
@@ -925,8 +928,6 @@
base::TimeTicks request_time_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(RequestImpl);
};
class HostResolverManager::ProbeRequestImpl
@@ -1045,6 +1046,9 @@
params_.resolver_proc = new SystemHostResolverProc();
}
+ ProcTask(const ProcTask&) = delete;
+ ProcTask& operator=(const ProcTask&) = delete;
+
// Cancels this ProcTask. Any outstanding resolve attempts running on worker
// thread will continue running, but they will post back to the network thread
// before checking their WeakPtrs to find that this task is cancelled.
@@ -1220,8 +1224,6 @@
// delayed retry tasks. Invalidate WeakPtrs on completion and cancellation to
// cancel handling of such posted tasks.
base::WeakPtrFactory<ProcTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ProcTask);
};
//-----------------------------------------------------------------------------
diff --git a/net/dns/host_resolver_manager.h b/net/dns/host_resolver_manager.h
index ac4e6827..1af6e660 100644
--- a/net/dns/host_resolver_manager.h
+++ b/net/dns/host_resolver_manager.h
@@ -139,6 +139,9 @@
SystemDnsConfigChangeNotifier* system_dns_config_notifier,
NetLog* net_log);
+ HostResolverManager(const HostResolverManager&) = delete;
+ HostResolverManager& operator=(const HostResolverManager&) = delete;
+
// If any completion callbacks are pending when the resolver is destroyed,
// the host resolutions are cancelled, and the completion callbacks will not
// be called.
@@ -497,8 +500,6 @@
base::WeakPtrFactory<HostResolverManager> weak_ptr_factory_{this};
base::WeakPtrFactory<HostResolverManager> probe_weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HostResolverManager);
};
// Resolves a local hostname (such as "localhost" or "vhost.localhost") into
diff --git a/net/dns/host_resolver_manager_fuzzer.cc b/net/dns/host_resolver_manager_fuzzer.cc
index c06d47e..7c0ed59 100644
--- a/net/dns/host_resolver_manager_fuzzer.cc
+++ b/net/dns/host_resolver_manager_fuzzer.cc
@@ -43,6 +43,9 @@
data_provider_(data_provider),
dns_requests_(dns_requests) {}
+ DnsRequest(const DnsRequest&) = delete;
+ DnsRequest& operator=(const DnsRequest&) = delete;
+
~DnsRequest() = default;
// Creates and starts a DNS request using fuzzed parameters. If the request
@@ -219,8 +222,6 @@
net::AddressList address_list_;
std::unique_ptr<base::RunLoop> run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(DnsRequest);
};
} // namespace
diff --git a/net/dns/host_resolver_mdns_task.h b/net/dns/host_resolver_mdns_task.h
index b91e77bd..ce8020e 100644
--- a/net/dns/host_resolver_mdns_task.h
+++ b/net/dns/host_resolver_mdns_task.h
@@ -32,6 +32,10 @@
HostResolverMdnsTask(MDnsClient* mdns_client,
std::string hostname,
const std::vector<DnsQueryType>& query_types);
+
+ HostResolverMdnsTask(const HostResolverMdnsTask&) = delete;
+ HostResolverMdnsTask& operator=(const HostResolverMdnsTask&) = delete;
+
~HostResolverMdnsTask();
// Starts the task. |completion_closure| will be called asynchronously.
@@ -64,8 +68,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<HostResolverMdnsTask> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HostResolverMdnsTask);
};
} // namespace net
diff --git a/net/dns/mdns_client_impl.h b/net/dns/mdns_client_impl.h
index b5d1ab3..8fcec6fd 100644
--- a/net/dns/mdns_client_impl.h
+++ b/net/dns/mdns_client_impl.h
@@ -40,6 +40,10 @@
public:
MDnsSocketFactoryImpl() : net_log_(nullptr) {}
explicit MDnsSocketFactoryImpl(NetLog* net_log) : net_log_(net_log) {}
+
+ MDnsSocketFactoryImpl(const MDnsSocketFactoryImpl&) = delete;
+ MDnsSocketFactoryImpl& operator=(const MDnsSocketFactoryImpl&) = delete;
+
~MDnsSocketFactoryImpl() override {}
void CreateSockets(
@@ -47,8 +51,6 @@
private:
NetLog* const net_log_;
-
- DISALLOW_COPY_AND_ASSIGN(MDnsSocketFactoryImpl);
};
// A connection to the network for multicast DNS clients. It reads data into
@@ -64,6 +66,10 @@
};
explicit MDnsConnection(MDnsConnection::Delegate* delegate);
+
+ MDnsConnection(const MDnsConnection&) = delete;
+ MDnsConnection& operator=(const MDnsConnection&) = delete;
+
virtual ~MDnsConnection();
// Succeeds if at least one of the socket handlers succeeded.
@@ -75,6 +81,10 @@
public:
SocketHandler(std::unique_ptr<DatagramServerSocket> socket,
MDnsConnection* connection);
+
+ SocketHandler(const SocketHandler&) = delete;
+ SocketHandler& operator=(const SocketHandler&) = delete;
+
~SocketHandler();
int Start();
@@ -94,8 +104,6 @@
IPEndPoint multicast_addr_;
bool send_in_progress_;
base::queue<std::pair<scoped_refptr<IOBuffer>, unsigned>> send_queue_;
-
- DISALLOW_COPY_AND_ASSIGN(SocketHandler);
};
// Callback for handling a datagram being received on either ipv4 or ipv6.
@@ -112,8 +120,6 @@
Delegate* delegate_;
base::WeakPtrFactory<MDnsConnection> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MDnsConnection);
};
class MDnsListenerImpl;
@@ -127,6 +133,10 @@
class Core : public base::SupportsWeakPtr<Core>, MDnsConnection::Delegate {
public:
Core(base::Clock* clock, base::OneShotTimer* timer);
+
+ Core(const Core&) = delete;
+ Core& operator=(const Core&) = delete;
+
~Core() override;
// Initialize the core.
@@ -199,8 +209,6 @@
base::Time scheduled_cleanup_;
std::unique_ptr<MDnsConnection> connection_;
-
- DISALLOW_COPY_AND_ASSIGN(Core);
};
MDnsClientImpl();
@@ -247,6 +255,9 @@
MDnsListener::Delegate* delegate,
MDnsClientImpl* client);
+ MDnsListenerImpl(const MDnsListenerImpl&) = delete;
+ MDnsListenerImpl& operator=(const MDnsListenerImpl&) = delete;
+
~MDnsListenerImpl() override;
// MDnsListener implementation:
@@ -284,7 +295,6 @@
bool active_refresh_;
base::CancelableRepeatingClosure next_refresh_;
- DISALLOW_COPY_AND_ASSIGN(MDnsListenerImpl);
};
class MDnsTransactionImpl : public base::SupportsWeakPtr<MDnsTransactionImpl>,
@@ -296,6 +306,10 @@
int flags,
const MDnsTransaction::ResultCallback& callback,
MDnsClientImpl* client);
+
+ MDnsTransactionImpl(const MDnsTransactionImpl&) = delete;
+ MDnsTransactionImpl& operator=(const MDnsTransactionImpl&) = delete;
+
~MDnsTransactionImpl() override;
// MDnsTransaction implementation:
@@ -346,8 +360,6 @@
bool started_;
int flags_;
-
- DISALLOW_COPY_AND_ASSIGN(MDnsTransactionImpl);
};
} // namespace net
diff --git a/net/dns/mdns_client_unittest.cc b/net/dns/mdns_client_unittest.cc
index f432500a..261ee99 100644
--- a/net/dns/mdns_client_unittest.cc
+++ b/net/dns/mdns_client_unittest.cc
@@ -419,17 +419,22 @@
class MockClock : public base::Clock {
public:
MockClock() = default;
+
+ MockClock(const MockClock&) = delete;
+ MockClock& operator=(const MockClock&) = delete;
+
~MockClock() override = default;
MOCK_CONST_METHOD0(Now, base::Time());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockClock);
};
class MockTimer : public base::MockOneShotTimer {
public:
MockTimer() {}
+
+ MockTimer(const MockTimer&) = delete;
+ MockTimer& operator=(const MockTimer&) = delete;
+
~MockTimer() override = default;
void Start(const base::Location& posted_from,
@@ -443,9 +448,6 @@
// Does not replace the behavior of MockTimer::Start().
MOCK_METHOD2(StartObserver,
void(const base::Location& posted_from, base::TimeDelta delay));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockTimer);
};
} // namespace
diff --git a/net/dns/mock_host_resolver.cc b/net/dns/mock_host_resolver.cc
index fb76ff471..496b6b6 100644
--- a/net/dns/mock_host_resolver.cc
+++ b/net/dns/mock_host_resolver.cc
@@ -103,6 +103,9 @@
resolver_(resolver),
complete_(false) {}
+ RequestImpl(const RequestImpl&) = delete;
+ RequestImpl& operator=(const RequestImpl&) = delete;
+
~RequestImpl() override {
if (id_ > 0) {
if (resolver_)
@@ -261,8 +264,6 @@
// outstanding request objects.
base::WeakPtr<MockHostResolverBase> resolver_;
bool complete_;
-
- DISALLOW_COPY_AND_ASSIGN(RequestImpl);
};
class MockHostResolverBase::ProbeRequestImpl
@@ -1083,6 +1084,9 @@
explicit RequestImpl(base::WeakPtr<HangingHostResolver> resolver)
: resolver_(resolver) {}
+ RequestImpl(const RequestImpl&) = delete;
+ RequestImpl& operator=(const RequestImpl&) = delete;
+
~RequestImpl() override {
if (is_running_ && resolver_)
resolver_->num_cancellations_++;
@@ -1131,8 +1135,6 @@
// outstanding request objects.
base::WeakPtr<HangingHostResolver> resolver_;
bool is_running_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(RequestImpl);
};
HangingHostResolver::HangingHostResolver() = default;
diff --git a/net/dns/mock_host_resolver.h b/net/dns/mock_host_resolver.h
index f62d7fdd..247b005 100644
--- a/net/dns/mock_host_resolver.h
+++ b/net/dns/mock_host_resolver.h
@@ -97,6 +97,9 @@
class MdnsListenerImpl;
public:
+ MockHostResolverBase(const MockHostResolverBase&) = delete;
+ MockHostResolverBase& operator=(const MockHostResolverBase&) = delete;
+
~MockHostResolverBase() override;
RuleBasedHostResolverProc* rules() {
@@ -311,8 +314,6 @@
const base::TickClock* tick_clock_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(MockHostResolverBase);
};
class MockHostResolver : public MockHostResolverBase {
@@ -354,6 +355,10 @@
scoped_refptr<RuleBasedHostResolverProc> rules = nullptr,
bool use_caching = false,
int cache_invalidation_num = 0);
+
+ MockHostResolverFactory(const MockHostResolverFactory&) = delete;
+ MockHostResolverFactory& operator=(const MockHostResolverFactory&) = delete;
+
~MockHostResolverFactory() override;
std::unique_ptr<HostResolver> CreateResolver(
@@ -370,8 +375,6 @@
const scoped_refptr<RuleBasedHostResolverProc> rules_;
const bool use_caching_;
const int cache_invalidation_num_;
-
- DISALLOW_COPY_AND_ASSIGN(MockHostResolverFactory);
};
// RuleBasedHostResolverProc applies a set of rules to map a host string to
diff --git a/net/dns/notify_watcher_mac.h b/net/dns/notify_watcher_mac.h
index ed01246..79063c4 100644
--- a/net/dns/notify_watcher_mac.h
+++ b/net/dns/notify_watcher_mac.h
@@ -22,6 +22,9 @@
NotifyWatcherMac();
+ NotifyWatcherMac(const NotifyWatcherMac&) = delete;
+ NotifyWatcherMac& operator=(const NotifyWatcherMac&) = delete;
+
// When deleted, automatically cancels.
virtual ~NotifyWatcherMac();
@@ -40,8 +43,6 @@
int notify_token_;
CallbackType callback_;
std::unique_ptr<base::FileDescriptorWatcher::Controller> watcher_;
-
- DISALLOW_COPY_AND_ASSIGN(NotifyWatcherMac);
};
} // namespace net
diff --git a/net/dns/record_rdata.h b/net/dns/record_rdata.h
index c862389d0..8479857 100644
--- a/net/dns/record_rdata.h
+++ b/net/dns/record_rdata.h
@@ -50,6 +50,9 @@
public:
static const uint16_t kType = dns_protocol::kTypeSRV;
+ SrvRecordRdata(const SrvRecordRdata&) = delete;
+ SrvRecordRdata& operator=(const SrvRecordRdata&) = delete;
+
~SrvRecordRdata() override;
static std::unique_ptr<SrvRecordRdata> Create(const base::StringPiece& data,
const DnsRecordParser& parser);
@@ -71,8 +74,6 @@
uint16_t port_;
std::string target_;
-
- DISALLOW_COPY_AND_ASSIGN(SrvRecordRdata);
};
// A Record format (http://www.ietf.org/rfc/rfc1035.txt):
@@ -81,6 +82,9 @@
public:
static const uint16_t kType = dns_protocol::kTypeA;
+ ARecordRdata(const ARecordRdata&) = delete;
+ ARecordRdata& operator=(const ARecordRdata&) = delete;
+
~ARecordRdata() override;
static std::unique_ptr<ARecordRdata> Create(const base::StringPiece& data,
const DnsRecordParser& parser);
@@ -93,8 +97,6 @@
ARecordRdata();
IPAddress address_;
-
- DISALLOW_COPY_AND_ASSIGN(ARecordRdata);
};
// AAAA Record format (http://www.ietf.org/rfc/rfc1035.txt):
@@ -103,6 +105,9 @@
public:
static const uint16_t kType = dns_protocol::kTypeAAAA;
+ AAAARecordRdata(const AAAARecordRdata&) = delete;
+ AAAARecordRdata& operator=(const AAAARecordRdata&) = delete;
+
~AAAARecordRdata() override;
static std::unique_ptr<AAAARecordRdata> Create(const base::StringPiece& data,
const DnsRecordParser& parser);
@@ -115,8 +120,6 @@
AAAARecordRdata();
IPAddress address_;
-
- DISALLOW_COPY_AND_ASSIGN(AAAARecordRdata);
};
// CNAME record format (http://www.ietf.org/rfc/rfc1035.txt):
@@ -125,6 +128,9 @@
public:
static const uint16_t kType = dns_protocol::kTypeCNAME;
+ CnameRecordRdata(const CnameRecordRdata&) = delete;
+ CnameRecordRdata& operator=(const CnameRecordRdata&) = delete;
+
~CnameRecordRdata() override;
static std::unique_ptr<CnameRecordRdata> Create(
const base::StringPiece& data,
@@ -138,8 +144,6 @@
CnameRecordRdata();
std::string cname_;
-
- DISALLOW_COPY_AND_ASSIGN(CnameRecordRdata);
};
// PTR record format (http://www.ietf.org/rfc/rfc1035.txt):
@@ -148,6 +152,9 @@
public:
static const uint16_t kType = dns_protocol::kTypePTR;
+ PtrRecordRdata(const PtrRecordRdata&) = delete;
+ PtrRecordRdata& operator=(const PtrRecordRdata&) = delete;
+
~PtrRecordRdata() override;
static std::unique_ptr<PtrRecordRdata> Create(const base::StringPiece& data,
const DnsRecordParser& parser);
@@ -160,8 +167,6 @@
PtrRecordRdata();
std::string ptrdomain_;
-
- DISALLOW_COPY_AND_ASSIGN(PtrRecordRdata);
};
// TXT record format (http://www.ietf.org/rfc/rfc1035.txt):
@@ -171,6 +176,9 @@
public:
static const uint16_t kType = dns_protocol::kTypeTXT;
+ TxtRecordRdata(const TxtRecordRdata&) = delete;
+ TxtRecordRdata& operator=(const TxtRecordRdata&) = delete;
+
~TxtRecordRdata() override;
static std::unique_ptr<TxtRecordRdata> Create(const base::StringPiece& data,
const DnsRecordParser& parser);
@@ -183,8 +191,6 @@
TxtRecordRdata();
std::vector<std::string> texts_;
-
- DISALLOW_COPY_AND_ASSIGN(TxtRecordRdata);
};
// Only the subset of the NSEC record format required by mDNS is supported.
@@ -195,6 +201,9 @@
public:
static const uint16_t kType = dns_protocol::kTypeNSEC;
+ NsecRecordRdata(const NsecRecordRdata&) = delete;
+ NsecRecordRdata& operator=(const NsecRecordRdata&) = delete;
+
~NsecRecordRdata() override;
static std::unique_ptr<NsecRecordRdata> Create(const base::StringPiece& data,
const DnsRecordParser& parser);
@@ -217,8 +226,6 @@
NsecRecordRdata();
std::vector<uint8_t> bitmap_;
-
- DISALLOW_COPY_AND_ASSIGN(NsecRecordRdata);
};
// OPT record format (https://tools.ietf.org/html/rfc6891):
diff --git a/net/dns/system_dns_config_change_notifier.cc b/net/dns/system_dns_config_change_notifier.cc
index 68472cf..c01fee0 100644
--- a/net/dns/system_dns_config_change_notifier.cc
+++ b/net/dns/system_dns_config_change_notifier.cc
@@ -32,6 +32,9 @@
: task_runner_(base::SequencedTaskRunnerHandle::Get()),
observer_(observer) {}
+ WrappedObserver(const WrappedObserver&) = delete;
+ WrappedObserver& operator=(const WrappedObserver&) = delete;
+
~WrappedObserver() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); }
void OnNotifyThreadsafe(absl::optional<DnsConfig> config) {
@@ -54,8 +57,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<WrappedObserver> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WrappedObserver);
};
} // namespace
@@ -78,6 +79,9 @@
std::move(dns_config_service)));
}
+ Core(const Core&) = delete;
+ Core& operator=(const Core&) = delete;
+
~Core() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK(wrapped_observers_.empty());
@@ -181,8 +185,6 @@
SEQUENCE_CHECKER(sequence_checker_);
std::unique_ptr<DnsConfigService> dns_config_service_;
base::WeakPtrFactory<Core> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Core);
};
SystemDnsConfigChangeNotifier::SystemDnsConfigChangeNotifier()
diff --git a/net/dns/system_dns_config_change_notifier.h b/net/dns/system_dns_config_change_notifier.h
index 6ba0654c..472a740 100644
--- a/net/dns/system_dns_config_change_notifier.h
+++ b/net/dns/system_dns_config_change_notifier.h
@@ -52,6 +52,11 @@
SystemDnsConfigChangeNotifier(
scoped_refptr<base::SequencedTaskRunner> task_runner,
std::unique_ptr<DnsConfigService> dns_config_service);
+
+ SystemDnsConfigChangeNotifier(const SystemDnsConfigChangeNotifier&) = delete;
+ SystemDnsConfigChangeNotifier& operator=(
+ const SystemDnsConfigChangeNotifier&) = delete;
+
~SystemDnsConfigChangeNotifier();
// An added Observer will receive notifications on the sequence where
@@ -77,8 +82,6 @@
class Core;
std::unique_ptr<Core, base::OnTaskRunnerDeleter> core_;
-
- DISALLOW_COPY_AND_ASSIGN(SystemDnsConfigChangeNotifier);
};
} // namespace net
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sqlite/sqlite_persistent_cookie_store.cc
index f84d686..86f89e0 100644
--- a/net/extras/sqlite/sqlite_persistent_cookie_store.cc
+++ b/net/extras/sqlite/sqlite_persistent_cookie_store.cc
@@ -540,6 +540,9 @@
explicit IncrementTimeDelta(base::TimeDelta* delta)
: delta_(delta), original_value_(*delta), start_(base::Time::Now()) {}
+ IncrementTimeDelta(const IncrementTimeDelta&) = delete;
+ IncrementTimeDelta& operator=(const IncrementTimeDelta&) = delete;
+
~IncrementTimeDelta() {
*delta_ = original_value_ + base::Time::Now() - start_;
}
@@ -548,8 +551,6 @@
base::TimeDelta* delta_;
base::TimeDelta original_value_;
base::Time start_;
-
- DISALLOW_COPY_AND_ASSIGN(IncrementTimeDelta);
};
// Initializes the cookies table, returning true on success.
diff --git a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.h b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.h
index 06dbb955..9c2a3e6f 100644
--- a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.h
+++ b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.h
@@ -35,6 +35,11 @@
const scoped_refptr<base::SequencedTaskRunner>& client_task_runner,
const scoped_refptr<base::SequencedTaskRunner>& background_task_runner);
+ SQLitePersistentReportingAndNelStore(
+ const SQLitePersistentReportingAndNelStore&) = delete;
+ SQLitePersistentReportingAndNelStore& operator=(
+ const SQLitePersistentReportingAndNelStore&) = delete;
+
~SQLitePersistentReportingAndNelStore() override;
// NetworkErrorLoggingService::PersistentNelStore implementation
@@ -84,8 +89,6 @@
base::WeakPtrFactory<SQLitePersistentReportingAndNelStore> weak_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(SQLitePersistentReportingAndNelStore);
};
} // namespace net
diff --git a/net/filter/brotli_source_stream.cc b/net/filter/brotli_source_stream.cc
index 662eb26..c1f396a 100644
--- a/net/filter/brotli_source_stream.cc
+++ b/net/filter/brotli_source_stream.cc
@@ -34,6 +34,9 @@
CHECK(brotli_state_);
}
+ BrotliSourceStream(const BrotliSourceStream&) = delete;
+ BrotliSourceStream& operator=(const BrotliSourceStream&) = delete;
+
~BrotliSourceStream() override {
BrotliDecoderErrorCode error_code =
BrotliDecoderGetErrorCode(brotli_state_);
@@ -172,8 +175,6 @@
size_t used_memory_maximum_;
size_t consumed_bytes_;
size_t produced_bytes_;
-
- DISALLOW_COPY_AND_ASSIGN(BrotliSourceStream);
};
} // namespace
diff --git a/net/filter/filter_source_stream.h b/net/filter/filter_source_stream.h
index dadc8cc..99c4cf0 100644
--- a/net/filter/filter_source_stream.h
+++ b/net/filter/filter_source_stream.h
@@ -30,6 +30,9 @@
// |upstream| cannot be null.
FilterSourceStream(SourceType type, std::unique_ptr<SourceStream> upstream);
+ FilterSourceStream(const FilterSourceStream&) = delete;
+ FilterSourceStream& operator=(const FilterSourceStream&) = delete;
+
~FilterSourceStream() override;
// SourceStream implementation.
@@ -113,8 +116,6 @@
// Reading from |upstream_| has returned 0 byte or an error code.
bool upstream_end_reached_;
-
- DISALLOW_COPY_AND_ASSIGN(FilterSourceStream);
};
} // namespace net
diff --git a/net/filter/filter_source_stream_unittest.cc b/net/filter/filter_source_stream_unittest.cc
index 3be056f3..9bf5218 100644
--- a/net/filter/filter_source_stream_unittest.cc
+++ b/net/filter/filter_source_stream_unittest.cc
@@ -27,6 +27,11 @@
public:
TestFilterSourceStreamBase(std::unique_ptr<SourceStream> upstream)
: FilterSourceStream(SourceStream::TYPE_NONE, std::move(upstream)) {}
+
+ TestFilterSourceStreamBase(const TestFilterSourceStreamBase&) = delete;
+ TestFilterSourceStreamBase& operator=(const TestFilterSourceStreamBase&) =
+ delete;
+
~TestFilterSourceStreamBase() override { DCHECK(buffer_.empty()); }
std::string GetTypeAsString() const override { return type_string_; }
@@ -52,8 +57,6 @@
private:
std::string type_string_;
-
- DISALLOW_COPY_AND_ASSIGN(TestFilterSourceStreamBase);
};
// A FilterSourceStream that needs all input data before it can return non-zero
diff --git a/net/filter/fuzzed_source_stream.h b/net/filter/fuzzed_source_stream.h
index e87c56f..105790e 100644
--- a/net/filter/fuzzed_source_stream.h
+++ b/net/filter/fuzzed_source_stream.h
@@ -25,6 +25,10 @@
// |data_provider| is used to determine behavior of the FuzzedSourceStream.
// It must remain valid until after the FuzzedSocket is destroyed.
explicit FuzzedSourceStream(FuzzedDataProvider* data_provider);
+
+ FuzzedSourceStream(const FuzzedSourceStream&) = delete;
+ FuzzedSourceStream& operator=(const FuzzedSourceStream&) = delete;
+
~FuzzedSourceStream() override;
// SourceStream implementation
@@ -47,8 +51,6 @@
// Last result returned by Read() is an error or 0.
bool end_returned_;
-
- DISALLOW_COPY_AND_ASSIGN(FuzzedSourceStream);
};
} // namespace net
diff --git a/net/filter/gzip_header.h b/net/filter/gzip_header.h
index e9ecd04..275f208c 100644
--- a/net/filter/gzip_header.h
+++ b/net/filter/gzip_header.h
@@ -31,6 +31,10 @@
};
GZipHeader();
+
+ GZipHeader(const GZipHeader&) = delete;
+ GZipHeader& operator=(const GZipHeader&) = delete;
+
~GZipHeader();
// Wipe the slate clean and start from scratch.
@@ -88,8 +92,6 @@
int state_; // our current State in the parsing FSM: an int so we can ++
uint8_t flags_; // the flags byte of the header ("FLG" in the RFC)
uint16_t extra_length_; // how much of the "extra field" we have yet to read
-
- DISALLOW_COPY_AND_ASSIGN(GZipHeader);
};
} // namespace net
diff --git a/net/filter/gzip_source_stream.h b/net/filter/gzip_source_stream.h
index ab554fa..77ff3c0 100644
--- a/net/filter/gzip_source_stream.h
+++ b/net/filter/gzip_source_stream.h
@@ -28,6 +28,9 @@
//
class NET_EXPORT_PRIVATE GzipSourceStream : public FilterSourceStream {
public:
+ GzipSourceStream(const GzipSourceStream&) = delete;
+ GzipSourceStream& operator=(const GzipSourceStream&) = delete;
+
~GzipSourceStream() override;
// Creates a GzipSourceStream. Return nullptr if initialization fails.
@@ -107,8 +110,6 @@
// Used when replaying data.
InputState replay_state_;
-
- DISALLOW_COPY_AND_ASSIGN(GzipSourceStream);
};
} // namespace net
diff --git a/net/filter/mock_source_stream.h b/net/filter/mock_source_stream.h
index 2f6135f..9151012 100644
--- a/net/filter/mock_source_stream.h
+++ b/net/filter/mock_source_stream.h
@@ -27,6 +27,10 @@
ASYNC,
};
MockSourceStream();
+
+ MockSourceStream(const MockSourceStream&) = delete;
+ MockSourceStream& operator=(const MockSourceStream&) = delete;
+
// The destructor will crash in debug build if there is any pending read.
~MockSourceStream() override;
@@ -80,8 +84,6 @@
scoped_refptr<IOBuffer> dest_buffer_;
CompletionOnceCallback callback_;
int dest_buffer_size_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(MockSourceStream);
};
} // namespace net
diff --git a/net/filter/source_stream.h b/net/filter/source_stream.h
index 5337397..c9253c7 100644
--- a/net/filter/source_stream.h
+++ b/net/filter/source_stream.h
@@ -32,6 +32,9 @@
// |type| is the type of the SourceStream.
explicit SourceStream(SourceType type);
+ SourceStream(const SourceStream&) = delete;
+ SourceStream& operator=(const SourceStream&) = delete;
+
virtual ~SourceStream();
// Initiaties a read from the stream.
@@ -64,8 +67,6 @@
private:
SourceType type_;
-
- DISALLOW_COPY_AND_ASSIGN(SourceStream);
};
} // namespace net
diff --git a/net/http/bidirectional_stream_unittest.cc b/net/http/bidirectional_stream_unittest.cc
index 48e31ad9..d6874be 100644
--- a/net/http/bidirectional_stream_unittest.cc
+++ b/net/http/bidirectional_stream_unittest.cc
@@ -115,6 +115,9 @@
run_until_completion_(false),
not_expect_callback_(false) {}
+ TestDelegateBase(const TestDelegateBase&) = delete;
+ TestDelegateBase& operator=(const TestDelegateBase&) = delete;
+
~TestDelegateBase() override = default;
void OnStreamReady(bool request_headers_sent) override {
@@ -308,7 +311,6 @@
bool not_expect_callback_;
CompletionOnceCallback callback_;
- DISALLOW_COPY_AND_ASSIGN(TestDelegateBase);
};
// A delegate that deletes the stream in a particular callback.
@@ -324,6 +326,10 @@
DeleteStreamDelegate(IOBuffer* buf, int buf_len, Phase phase)
: TestDelegateBase(buf, buf_len), phase_(phase) {}
+
+ DeleteStreamDelegate(const DeleteStreamDelegate&) = delete;
+ DeleteStreamDelegate& operator=(const DeleteStreamDelegate&) = delete;
+
~DeleteStreamDelegate() override = default;
void OnHeadersReceived(
@@ -375,14 +381,16 @@
// Indicates in which callback the delegate should cancel or delete the
// stream.
Phase phase_;
-
- DISALLOW_COPY_AND_ASSIGN(DeleteStreamDelegate);
};
// A Timer that does not start a delayed task unless the timer is fired.
class MockTimer : public base::MockOneShotTimer {
public:
MockTimer() {}
+
+ MockTimer(const MockTimer&) = delete;
+ MockTimer& operator=(const MockTimer&) = delete;
+
~MockTimer() override = default;
void Start(const base::Location& posted_from,
@@ -393,9 +401,6 @@
base::MockOneShotTimer::Start(posted_from, infinite_delay,
std::move(user_task));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockTimer);
};
} // namespace
diff --git a/net/http/http_auth_filter.h b/net/http/http_auth_filter.h
index 45515fc..cf94570 100644
--- a/net/http/http_auth_filter.h
+++ b/net/http/http_auth_filter.h
@@ -36,6 +36,10 @@
class NET_EXPORT HttpAuthFilterAllowlist : public HttpAuthFilter {
public:
explicit HttpAuthFilterAllowlist(const std::string& server_allowlist);
+
+ HttpAuthFilterAllowlist(const HttpAuthFilterAllowlist&) = delete;
+ HttpAuthFilterAllowlist& operator=(const HttpAuthFilterAllowlist&) = delete;
+
~HttpAuthFilterAllowlist() override;
// Adds an individual URL |filter| to the list, of the specified |target|.
@@ -54,8 +58,6 @@
// We are using ProxyBypassRules because they have the functionality that we
// want, but we are not using it for proxy bypass.
ProxyBypassRules rules_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpAuthFilterAllowlist);
};
} // namespace net
diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc
index 8c3defbf..5855682 100644
--- a/net/http/http_auth_gssapi_posix.cc
+++ b/net/http/http_auth_gssapi_posix.cc
@@ -62,6 +62,9 @@
DCHECK(gssapi_lib_);
}
+ ScopedBuffer(const ScopedBuffer&) = delete;
+ ScopedBuffer& operator=(const ScopedBuffer&) = delete;
+
~ScopedBuffer() {
if (buffer_ != GSS_C_NO_BUFFER) {
OM_uint32 minor_status = 0;
@@ -77,8 +80,6 @@
private:
gss_buffer_t buffer_;
GSSAPILibrary* gssapi_lib_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedBuffer);
};
// ScopedName releases a gss_name_t when it goes out of scope.
@@ -89,6 +90,9 @@
DCHECK(gssapi_lib_);
}
+ ScopedName(const ScopedName&) = delete;
+ ScopedName& operator=(const ScopedName&) = delete;
+
~ScopedName() {
if (name_ != GSS_C_NO_NAME) {
OM_uint32 minor_status = 0;
@@ -106,8 +110,6 @@
private:
gss_name_t name_;
GSSAPILibrary* gssapi_lib_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedName);
};
bool OidEquals(const gss_OID left, const gss_OID right) {
diff --git a/net/http/http_auth_gssapi_posix.h b/net/http/http_auth_gssapi_posix.h
index 05b70ff..f0a44dd6 100644
--- a/net/http/http_auth_gssapi_posix.h
+++ b/net/http/http_auth_gssapi_posix.h
@@ -203,6 +203,10 @@
class ScopedSecurityContext {
public:
explicit ScopedSecurityContext(GSSAPILibrary* gssapi_lib);
+
+ ScopedSecurityContext(const ScopedSecurityContext&) = delete;
+ ScopedSecurityContext& operator=(const ScopedSecurityContext&) = delete;
+
~ScopedSecurityContext();
gss_ctx_id_t get() const { return security_context_; }
@@ -211,8 +215,6 @@
private:
gss_ctx_id_t security_context_ = GSS_C_NO_CONTEXT;
GSSAPILibrary* gssapi_lib_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedSecurityContext);
};
diff --git a/net/http/http_auth_handler.h b/net/http/http_auth_handler.h
index 1a17af7..f63f697 100644
--- a/net/http/http_auth_handler.h
+++ b/net/http/http_auth_handler.h
@@ -34,6 +34,10 @@
class NET_EXPORT_PRIVATE HttpAuthHandler {
public:
HttpAuthHandler();
+
+ HttpAuthHandler(const HttpAuthHandler&) = delete;
+ HttpAuthHandler& operator=(const HttpAuthHandler&) = delete;
+
virtual ~HttpAuthHandler();
// Initializes the handler using a challenge issued by a server.
@@ -236,8 +240,6 @@
NetLogWithSource net_log_;
CompletionOnceCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpAuthHandler);
};
} // namespace net
diff --git a/net/http/http_auth_handler_digest.h b/net/http/http_auth_handler_digest.h
index b8688ce..e60fa739 100644
--- a/net/http/http_auth_handler_digest.h
+++ b/net/http/http_auth_handler_digest.h
@@ -27,12 +27,14 @@
class NET_EXPORT_PRIVATE NonceGenerator {
public:
NonceGenerator();
+
+ NonceGenerator(const NonceGenerator&) = delete;
+ NonceGenerator& operator=(const NonceGenerator&) = delete;
+
virtual ~NonceGenerator();
// Generates a client nonce.
virtual std::string GenerateNonce() const = 0;
- private:
- DISALLOW_COPY_AND_ASSIGN(NonceGenerator);
};
// DynamicNonceGenerator does a random shuffle of 16
diff --git a/net/http/http_auth_handler_factory.h b/net/http/http_auth_handler_factory.h
index aeba0b84..f74e7ef 100644
--- a/net/http/http_auth_handler_factory.h
+++ b/net/http/http_auth_handler_factory.h
@@ -41,6 +41,10 @@
};
HttpAuthHandlerFactory() : http_auth_preferences_(nullptr) {}
+
+ HttpAuthHandlerFactory(const HttpAuthHandlerFactory&) = delete;
+ HttpAuthHandlerFactory& operator=(const HttpAuthHandlerFactory&) = delete;
+
virtual ~HttpAuthHandlerFactory() {}
// Sets the source of the HTTP authentication preferences.
@@ -155,8 +159,6 @@
private:
// The preferences for HTTP authentication.
const HttpAuthPreferences* http_auth_preferences_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpAuthHandlerFactory);
};
// The HttpAuthHandlerRegistryFactory dispatches create requests out
@@ -165,6 +167,12 @@
: public HttpAuthHandlerFactory {
public:
HttpAuthHandlerRegistryFactory();
+
+ HttpAuthHandlerRegistryFactory(const HttpAuthHandlerRegistryFactory&) =
+ delete;
+ HttpAuthHandlerRegistryFactory& operator=(
+ const HttpAuthHandlerRegistryFactory&) = delete;
+
~HttpAuthHandlerRegistryFactory() override;
// Sets the preferences into the factory associated with |scheme|.
@@ -238,7 +246,6 @@
std::map<std::string, std::unique_ptr<HttpAuthHandlerFactory>>;
FactoryMap factory_map_;
- DISALLOW_COPY_AND_ASSIGN(HttpAuthHandlerRegistryFactory);
};
} // namespace net
diff --git a/net/http/http_auth_handler_ntlm.h b/net/http/http_auth_handler_ntlm.h
index ab83e61..f8ae2a1 100644
--- a/net/http/http_auth_handler_ntlm.h
+++ b/net/http/http_auth_handler_ntlm.h
@@ -44,6 +44,10 @@
class Factory : public HttpAuthHandlerFactory {
public:
Factory();
+
+ Factory(const Factory&) = delete;
+ Factory& operator=(const Factory&) = delete;
+
~Factory() override;
int CreateAuthHandler(HttpAuthChallengeTokenizer* challenge,
@@ -70,8 +74,6 @@
#if defined(NTLM_SSPI)
std::unique_ptr<SSPILibrary> sspi_library_;
#endif // defined(NTLM_SSPI)
-
- DISALLOW_COPY_AND_ASSIGN(Factory);
};
#if defined(NTLM_PORTABLE)
diff --git a/net/http/http_auth_preferences.h b/net/http/http_auth_preferences.h
index 2e941cd..9bf18da 100644
--- a/net/http/http_auth_preferences.h
+++ b/net/http/http_auth_preferences.h
@@ -33,6 +33,10 @@
};
HttpAuthPreferences();
+
+ HttpAuthPreferences(const HttpAuthPreferences&) = delete;
+ HttpAuthPreferences& operator=(const HttpAuthPreferences&) = delete;
+
virtual ~HttpAuthPreferences();
virtual bool NegotiateDisableCnameLookup() const;
@@ -118,7 +122,6 @@
#endif
std::unique_ptr<URLSecurityManager> security_manager_;
- DISALLOW_COPY_AND_ASSIGN(HttpAuthPreferences);
};
} // namespace net
diff --git a/net/http/http_basic_state.h b/net/http/http_basic_state.h
index 06c46df..cc98f7d 100644
--- a/net/http/http_basic_state.h
+++ b/net/http/http_basic_state.h
@@ -31,6 +31,10 @@
public:
HttpBasicState(std::unique_ptr<ClientSocketHandle> connection,
bool using_proxy);
+
+ HttpBasicState(const HttpBasicState&) = delete;
+ HttpBasicState& operator=(const HttpBasicState&) = delete;
+
~HttpBasicState();
// Initialize() must be called before using any of the other methods.
@@ -85,8 +89,6 @@
std::string request_method_;
MutableNetworkTrafficAnnotationTag traffic_annotation_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpBasicState);
};
} // namespace net
diff --git a/net/http/http_basic_stream.h b/net/http/http_basic_stream.h
index eeea674..85e049db 100644
--- a/net/http/http_basic_stream.h
+++ b/net/http/http_basic_stream.h
@@ -39,6 +39,10 @@
// initialize it correctly.
HttpBasicStream(std::unique_ptr<ClientSocketHandle> connection,
bool using_proxy);
+
+ HttpBasicStream(const HttpBasicStream&) = delete;
+ HttpBasicStream& operator=(const HttpBasicStream&) = delete;
+
~HttpBasicStream() override;
// HttpStream methods:
@@ -105,8 +109,6 @@
HttpBasicState state_;
base::TimeTicks confirm_handshake_end_;
RequestHeadersCallback request_headers_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpBasicStream);
};
} // namespace net
diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h
index 75c0f83..de6c169 100644
--- a/net/http/http_cache_transaction.h
+++ b/net/http/http_cache_transaction.h
@@ -87,6 +87,10 @@
Transaction(RequestPriority priority,
HttpCache* cache);
+
+ Transaction(const Transaction&) = delete;
+ Transaction& operator=(const Transaction&) = delete;
+
~Transaction() override;
// Virtual so it can be extended for testing.
@@ -680,8 +684,6 @@
bool in_do_loop_;
base::WeakPtrFactory<Transaction> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Transaction);
};
} // namespace net
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index eabfe1a..d10f70f0 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -352,6 +352,10 @@
FastTransactionServer() {
no_store = false;
}
+
+ FastTransactionServer(const FastTransactionServer&) = delete;
+ FastTransactionServer& operator=(const FastTransactionServer&) = delete;
+
~FastTransactionServer() = default;
void set_no_store(bool value) { no_store = value; }
@@ -366,7 +370,6 @@
private:
static bool no_store;
- DISALLOW_COPY_AND_ASSIGN(FastTransactionServer);
};
bool FastTransactionServer::no_store;
@@ -402,6 +405,10 @@
redirect_ = false;
length_ = 80;
}
+
+ RangeTransactionServer(const RangeTransactionServer&) = delete;
+ RangeTransactionServer& operator=(const RangeTransactionServer&) = delete;
+
~RangeTransactionServer() {
not_modified_ = false;
modified_ = false;
@@ -443,7 +450,6 @@
static bool bad_200_;
static bool redirect_;
static int64_t length_;
- DISALLOW_COPY_AND_ASSIGN(RangeTransactionServer);
};
bool RangeTransactionServer::not_modified_ = false;
bool RangeTransactionServer::modified_ = false;
diff --git a/net/http/http_cache_writers.h b/net/http/http_cache_writers.h
index e77e98c4..14701bf 100644
--- a/net/http/http_cache_writers.h
+++ b/net/http/http_cache_writers.h
@@ -55,6 +55,10 @@
// |cache| and |entry| must outlive this object.
Writers(HttpCache* cache, HttpCache::ActiveEntry* entry);
+
+ Writers(const Writers&) = delete;
+ Writers& operator=(const Writers&) = delete;
+
~Writers();
// Retrieves data from the network transaction associated with the Writers
@@ -288,7 +292,6 @@
base::OnceClosure cache_callback_; // Callback for cache_.
base::WeakPtrFactory<Writers> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(Writers);
};
} // namespace net
diff --git a/net/http/http_content_disposition.h b/net/http/http_content_disposition.h
index 7ae1bee..499293c 100644
--- a/net/http/http_content_disposition.h
+++ b/net/http/http_content_disposition.h
@@ -54,6 +54,10 @@
HttpContentDisposition(const std::string& header,
const std::string& referrer_charset);
+
+ HttpContentDisposition(const HttpContentDisposition&) = delete;
+ HttpContentDisposition& operator=(const HttpContentDisposition&) = delete;
+
~HttpContentDisposition();
bool is_attachment() const { return type() == ATTACHMENT; }
@@ -72,8 +76,6 @@
Type type_;
std::string filename_;
int parse_result_flags_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpContentDisposition);
};
} // namespace net
diff --git a/net/http/http_network_layer.h b/net/http/http_network_layer.h
index 49ec2247..94fcdf8 100644
--- a/net/http/http_network_layer.h
+++ b/net/http/http_network_layer.h
@@ -26,6 +26,10 @@
// contains a valid ProxyResolutionService. The HttpNetworkLayer must be
// destroyed before |session|.
explicit HttpNetworkLayer(HttpNetworkSession* session);
+
+ HttpNetworkLayer(const HttpNetworkLayer&) = delete;
+ HttpNetworkLayer& operator=(const HttpNetworkLayer&) = delete;
+
~HttpNetworkLayer() override;
// HttpTransactionFactory methods:
@@ -43,8 +47,6 @@
bool suspended_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(HttpNetworkLayer);
};
} // namespace net
diff --git a/net/http/http_network_session_peer.h b/net/http/http_network_session_peer.h
index f70223f..c0ea9a7 100644
--- a/net/http/http_network_session_peer.h
+++ b/net/http/http_network_session_peer.h
@@ -22,6 +22,10 @@
public:
// |session| should outlive the HttpNetworkSessionPeer.
explicit HttpNetworkSessionPeer(HttpNetworkSession* session);
+
+ HttpNetworkSessionPeer(const HttpNetworkSessionPeer&) = delete;
+ HttpNetworkSessionPeer& operator=(const HttpNetworkSessionPeer&) = delete;
+
~HttpNetworkSessionPeer();
void SetClientSocketPoolManager(
@@ -34,8 +38,6 @@
private:
HttpNetworkSession* const session_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpNetworkSessionPeer);
};
} // namespace net
diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index 947322b..f9963465 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -53,6 +53,9 @@
HttpNetworkTransaction(RequestPriority priority,
HttpNetworkSession* session);
+ HttpNetworkTransaction(const HttpNetworkTransaction&) = delete;
+ HttpNetworkTransaction& operator=(const HttpNetworkTransaction&) = delete;
+
~HttpNetworkTransaction() override;
// HttpTransaction methods:
@@ -443,8 +446,6 @@
size_t num_restarts_;
bool close_connection_on_destruction_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
};
} // namespace net
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 080b8cc..a68f217b 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -300,6 +300,10 @@
CapturingProxyResolver()
: proxy_server_(ProxyServer::SCHEME_HTTP, HostPortPair("myproxy", 80)) {}
+
+ CapturingProxyResolver(const CapturingProxyResolver&) = delete;
+ CapturingProxyResolver& operator=(const CapturingProxyResolver&) = delete;
+
~CapturingProxyResolver() override = default;
int GetProxyForURL(const GURL& url,
@@ -325,8 +329,6 @@
std::vector<LookupInfo> lookup_info_;
ProxyServer proxy_server_;
-
- DISALLOW_COPY_AND_ASSIGN(CapturingProxyResolver);
};
class CapturingProxyResolverFactory : public ProxyResolverFactory {
@@ -5875,6 +5877,12 @@
class SameProxyWithDifferentSchemesProxyResolver : public ProxyResolver {
public:
SameProxyWithDifferentSchemesProxyResolver() {}
+
+ SameProxyWithDifferentSchemesProxyResolver(
+ const SameProxyWithDifferentSchemesProxyResolver&) = delete;
+ SameProxyWithDifferentSchemesProxyResolver& operator=(
+ const SameProxyWithDifferentSchemesProxyResolver&) = delete;
+
~SameProxyWithDifferentSchemesProxyResolver() override {}
static constexpr uint16_t kProxyPort = 10000;
@@ -5916,9 +5924,6 @@
NOTREACHED();
return ERR_NOT_IMPLEMENTED;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SameProxyWithDifferentSchemesProxyResolver);
};
class SameProxyWithDifferentSchemesProxyResolverFactory
diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h
index 457b6f0..f205b4d 100644
--- a/net/http/http_proxy_client_socket.h
+++ b/net/http/http_proxy_client_socket.h
@@ -50,6 +50,9 @@
ProxyDelegate* proxy_delegate,
const NetworkTrafficAnnotationTag& traffic_annotation);
+ HttpProxyClientSocket(const HttpProxyClientSocket&) = delete;
+ HttpProxyClientSocket& operator=(const HttpProxyClientSocket&) = delete;
+
// On destruction Disconnect() is called.
~HttpProxyClientSocket() override;
@@ -172,8 +175,6 @@
const NetworkTrafficAnnotationTag traffic_annotation_;
const NetLogWithSource net_log_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocket);
};
} // namespace net
diff --git a/net/http/http_proxy_connect_job.h b/net/http/http_proxy_connect_job.h
index e8e50014..5df9ed9 100644
--- a/net/http/http_proxy_connect_job.h
+++ b/net/http/http_proxy_connect_job.h
@@ -108,6 +108,10 @@
scoped_refptr<HttpProxySocketParams> params,
ConnectJob::Delegate* delegate,
const NetLogWithSource* net_log);
+
+ HttpProxyConnectJob(const HttpProxyConnectJob&) = delete;
+ HttpProxyConnectJob& operator=(const HttpProxyConnectJob&) = delete;
+
~HttpProxyConnectJob() override;
// A single priority is used for tunnels over H2 and QUIC, which can be shared
@@ -254,8 +258,6 @@
base::TimeTicks connect_start_time_;
base::WeakPtrFactory<HttpProxyConnectJob> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob);
};
} // namespace net
diff --git a/net/http/http_raw_request_headers.h b/net/http/http_raw_request_headers.h
index a1e48c1..9a0ac6df 100644
--- a/net/http/http_raw_request_headers.h
+++ b/net/http/http_raw_request_headers.h
@@ -32,6 +32,10 @@
HttpRawRequestHeaders();
HttpRawRequestHeaders(HttpRawRequestHeaders&&);
HttpRawRequestHeaders& operator=(HttpRawRequestHeaders&&);
+
+ HttpRawRequestHeaders(const HttpRawRequestHeaders&) = delete;
+ HttpRawRequestHeaders& operator=(const HttpRawRequestHeaders&) = delete;
+
~HttpRawRequestHeaders();
void Assign(HttpRawRequestHeaders other) { *this = std::move(other); }
@@ -48,8 +52,6 @@
private:
HeaderVector headers_;
std::string request_line_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpRawRequestHeaders);
};
// A callback of this type can be passed to
diff --git a/net/http/http_request_headers.h b/net/http/http_request_headers.h
index 51fc9bd..06f3ddb 100644
--- a/net/http/http_request_headers.h
+++ b/net/http/http_request_headers.h
@@ -41,6 +41,10 @@
class NET_EXPORT Iterator {
public:
explicit Iterator(const HttpRequestHeaders& headers);
+
+ Iterator(const Iterator&) = delete;
+ Iterator& operator=(const Iterator&) = delete;
+
~Iterator();
// Advances the iterator to the next header, if any. Returns true if there
@@ -56,8 +60,6 @@
bool started_;
HttpRequestHeaders::HeaderVector::const_iterator curr_;
const HttpRequestHeaders::HeaderVector::const_iterator end_;
-
- DISALLOW_COPY_AND_ASSIGN(Iterator);
};
static const char kConnectMethod[];
diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc
index 9dc7f480..9456a04 100644
--- a/net/http/http_response_body_drainer_unittest.cc
+++ b/net/http/http_response_body_drainer_unittest.cc
@@ -88,6 +88,10 @@
is_last_chunk_zero_size_(false),
is_complete_(false),
can_reuse_connection_(true) {}
+
+ MockHttpStream(const MockHttpStream&) = delete;
+ MockHttpStream& operator=(const MockHttpStream&) = delete;
+
~MockHttpStream() override = default;
// HttpStream implementation.
@@ -186,8 +190,6 @@
bool can_reuse_connection_;
base::WeakPtrFactory<MockHttpStream> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MockHttpStream);
};
int MockHttpStream::ReadResponseBody(IOBuffer* buf,
diff --git a/net/http/http_server_properties_manager.h b/net/http/http_server_properties_manager.h
index 404c8972..2b35d89b 100644
--- a/net/http/http_server_properties_manager.h
+++ b/net/http/http_server_properties_manager.h
@@ -69,6 +69,10 @@
NetLog* net_log,
const base::TickClock* clock = nullptr);
+ HttpServerPropertiesManager(const HttpServerPropertiesManager&) = delete;
+ HttpServerPropertiesManager& operator=(const HttpServerPropertiesManager&) =
+ delete;
+
~HttpServerPropertiesManager();
// Populates passed in objects with data from preferences. If pref data is not
@@ -211,8 +215,6 @@
base::WeakPtrFactory<HttpServerPropertiesManager> pref_load_weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManager);
};
} // namespace net
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc
index 5db0412..6257fcc 100644
--- a/net/http/http_server_properties_manager_unittest.cc
+++ b/net/http/http_server_properties_manager_unittest.cc
@@ -71,6 +71,10 @@
class MockPrefDelegate : public net::HttpServerProperties::PrefDelegate {
public:
MockPrefDelegate() = default;
+
+ MockPrefDelegate(const MockPrefDelegate&) = delete;
+ MockPrefDelegate& operator=(const MockPrefDelegate&) = delete;
+
~MockPrefDelegate() override = default;
// HttpServerProperties::PrefDelegate implementation.
@@ -125,8 +129,6 @@
int num_pref_updates_ = 0;
base::OnceClosure set_properties_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(MockPrefDelegate);
};
// Converts |server_info_map| to a base::Value by running it through an
diff --git a/net/http/http_stream.h b/net/http/http_stream.h
index 559e18a..e645362 100644
--- a/net/http/http_stream.h
+++ b/net/http/http_stream.h
@@ -43,6 +43,10 @@
class NET_EXPORT_PRIVATE HttpStream {
public:
HttpStream() {}
+
+ HttpStream(const HttpStream&) = delete;
+ HttpStream& operator=(const HttpStream&) = delete;
+
virtual ~HttpStream() {}
// Initialize stream. Must be called before calling SendRequest().
@@ -202,9 +206,6 @@
// Accept-CH header fields received in HTTP responses, this value is available
// before any requests are made.
virtual base::StringPiece GetAcceptChViaAlps() const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HttpStream);
};
} // namespace net
diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h
index 28776979..e05f9da 100644
--- a/net/http/http_stream_factory.h
+++ b/net/http/http_stream_factory.h
@@ -53,6 +53,10 @@
};
explicit HttpStreamFactory(HttpNetworkSession* session);
+
+ HttpStreamFactory(const HttpStreamFactory&) = delete;
+ HttpStreamFactory& operator=(const HttpStreamFactory&) = delete;
+
virtual ~HttpStreamFactory();
void ProcessAlternativeServices(
@@ -164,8 +168,6 @@
// Factory used by job controllers for creating jobs.
std::unique_ptr<JobFactory> job_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpStreamFactory);
};
} // namespace net
diff --git a/net/http/http_stream_factory_job.h b/net/http/http_stream_factory_job.h
index d99a12c..874d239 100644
--- a/net/http/http_stream_factory_job.h
+++ b/net/http/http_stream_factory_job.h
@@ -164,6 +164,10 @@
bool is_websocket,
bool enable_ip_based_pooling,
NetLog* net_log);
+
+ Job(const Job&) = delete;
+ Job& operator=(const Job&) = delete;
+
~Job() override;
// Start initiates the process of creating a new HttpStream.
@@ -458,8 +462,6 @@
std::unique_ptr<SpdySessionPool::SpdySessionRequest> spdy_session_request_;
base::WeakPtrFactory<Job> ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Job);
};
// Factory for creating Jobs.
diff --git a/net/http/http_stream_factory_job_controller_unittest.cc b/net/http/http_stream_factory_job_controller_unittest.cc
index 5f24135..f6e4bdc9 100644
--- a/net/http/http_stream_factory_job_controller_unittest.cc
+++ b/net/http/http_stream_factory_job_controller_unittest.cc
@@ -110,6 +110,10 @@
class MockPrefDelegate : public HttpServerProperties::PrefDelegate {
public:
MockPrefDelegate() = default;
+
+ MockPrefDelegate(const MockPrefDelegate&) = delete;
+ MockPrefDelegate& operator=(const MockPrefDelegate&) = delete;
+
~MockPrefDelegate() override = default;
// HttpServerProperties::PrefDelegate implementation:
@@ -117,9 +121,6 @@
void SetServerProperties(const base::Value& value,
base::OnceClosure callback) override {}
void WaitForPrefLoad(base::OnceClosure pref_loaded_callback) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockPrefDelegate);
};
} // anonymous namespace
@@ -262,6 +263,11 @@
return test_proxy_delegate_.get();
}
+ HttpStreamFactoryJobControllerTest(
+ const HttpStreamFactoryJobControllerTest&) = delete;
+ HttpStreamFactoryJobControllerTest& operator=(
+ const HttpStreamFactoryJobControllerTest&) = delete;
+
~HttpStreamFactoryJobControllerTest() override {
if (quic_data_) {
EXPECT_TRUE(quic_data_->AllReadDataConsumed());
@@ -352,8 +358,6 @@
private:
std::unique_ptr<TestProxyDelegate> test_proxy_delegate_;
bool create_job_controller_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(HttpStreamFactoryJobControllerTest);
};
TEST_F(HttpStreamFactoryJobControllerTest, ProxyResolutionFailsSync) {
diff --git a/net/http/http_stream_factory_test_util.h b/net/http/http_stream_factory_test_util.h
index d94b2420..708a749 100644
--- a/net/http/http_stream_factory_test_util.h
+++ b/net/http/http_stream_factory_test_util.h
@@ -46,6 +46,10 @@
public:
MockHttpStreamRequestDelegate();
+ MockHttpStreamRequestDelegate(const MockHttpStreamRequestDelegate&) = delete;
+ MockHttpStreamRequestDelegate& operator=(
+ const MockHttpStreamRequestDelegate&) = delete;
+
~MockHttpStreamRequestDelegate() override;
// std::unique_ptr is not copyable and therefore cannot be mocked.
@@ -95,9 +99,6 @@
SSLCertRequestInfo* cert_info));
MOCK_METHOD0(OnQuicBroken, void());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockHttpStreamRequestDelegate);
};
class MockHttpStreamFactoryJob : public HttpStreamFactory::Job {
diff --git a/net/http/http_stream_parser.h b/net/http/http_stream_parser.h
index 0a415338..6141af9 100644
--- a/net/http/http_stream_parser.h
+++ b/net/http/http_stream_parser.h
@@ -55,6 +55,10 @@
const HttpRequestInfo* request,
GrowableIOBuffer* read_buffer,
const NetLogWithSource& net_log);
+
+ HttpStreamParser(const HttpStreamParser&) = delete;
+ HttpStreamParser& operator=(const HttpStreamParser&) = delete;
+
virtual ~HttpStreamParser();
// These functions implement the interface described in HttpStream with
@@ -315,8 +319,6 @@
MutableNetworkTrafficAnnotationTag traffic_annotation_;
base::WeakPtrFactory<HttpStreamParser> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HttpStreamParser);
};
} // namespace net
diff --git a/net/http/http_stream_request.h b/net/http/http_stream_request.h
index 8175d8d..778590a 100644
--- a/net/http/http_stream_request.h
+++ b/net/http/http_stream_request.h
@@ -163,6 +163,9 @@
const NetLogWithSource& net_log,
StreamType stream_type);
+ HttpStreamRequest(const HttpStreamRequest&) = delete;
+ HttpStreamRequest& operator=(const HttpStreamRequest&) = delete;
+
~HttpStreamRequest();
// When a HttpStream creation process is stalled due to necessity
@@ -230,8 +233,6 @@
bool using_spdy_;
ConnectionAttempts connection_attempts_;
const StreamType stream_type_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpStreamRequest);
};
} // namespace net
diff --git a/net/http/mock_allow_http_auth_preferences.h b/net/http/mock_allow_http_auth_preferences.h
index c00a8d2..144b516 100644
--- a/net/http/mock_allow_http_auth_preferences.h
+++ b/net/http/mock_allow_http_auth_preferences.h
@@ -15,14 +15,16 @@
class MockAllowHttpAuthPreferences : public HttpAuthPreferences {
public:
MockAllowHttpAuthPreferences();
+
+ MockAllowHttpAuthPreferences(const MockAllowHttpAuthPreferences&) = delete;
+ MockAllowHttpAuthPreferences& operator=(const MockAllowHttpAuthPreferences&) =
+ delete;
+
~MockAllowHttpAuthPreferences() override;
bool CanUseDefaultCredentials(const GURL& auth_origin) const override;
HttpAuth::DelegationType GetDelegationType(
const GURL& auth_origin) const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockAllowHttpAuthPreferences);
};
} // namespace net
diff --git a/net/http/partial_data.h b/net/http/partial_data.h
index 134c32e..b6f2ab8 100644
--- a/net/http/partial_data.h
+++ b/net/http/partial_data.h
@@ -32,6 +32,10 @@
class PartialData {
public:
PartialData();
+
+ PartialData(const PartialData&) = delete;
+ PartialData& operator=(const PartialData&) = delete;
+
~PartialData();
// Performs initialization of the object by examining the request |headers|
@@ -159,8 +163,6 @@
bool initial_validation_; // Only used for truncated entries.
CompletionOnceCallback callback_;
base::WeakPtrFactory<PartialData> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PartialData);
};
} // namespace net
diff --git a/net/http/proxy_client_socket.h b/net/http/proxy_client_socket.h
index 943126e..d20e906 100644
--- a/net/http/proxy_client_socket.h
+++ b/net/http/proxy_client_socket.h
@@ -27,6 +27,10 @@
class NET_EXPORT_PRIVATE ProxyClientSocket : public StreamSocket {
public:
ProxyClientSocket() {}
+
+ ProxyClientSocket(const ProxyClientSocket&) = delete;
+ ProxyClientSocket& operator=(const ProxyClientSocket&) = delete;
+
~ProxyClientSocket() override {}
// Returns the HttpResponseInfo (including HTTP Headers) from
@@ -77,9 +81,6 @@
// construction, this method should be called to strip everything
// but the auth header from the redirect response.
static void SanitizeProxyAuth(HttpResponseInfo& response);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProxyClientSocket);
};
} // namespace net
diff --git a/net/http/transport_security_persister.h b/net/http/transport_security_persister.h
index 7a5c5a3..130d25e 100644
--- a/net/http/transport_security_persister.h
+++ b/net/http/transport_security_persister.h
@@ -65,6 +65,11 @@
TransportSecurityState* state,
const scoped_refptr<base::SequencedTaskRunner>& background_runner,
const base::FilePath& data_path);
+
+ TransportSecurityPersister(const TransportSecurityPersister&) = delete;
+ TransportSecurityPersister& operator=(const TransportSecurityPersister&) =
+ delete;
+
~TransportSecurityPersister() override;
// Called by the TransportSecurityState when it changes its state.
@@ -128,8 +133,6 @@
scoped_refptr<base::SequencedTaskRunner> background_runner_;
base::WeakPtrFactory<TransportSecurityPersister> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TransportSecurityPersister);
};
} // namespace net
diff --git a/net/http/transport_security_state_test_util.h b/net/http/transport_security_state_test_util.h
index 50f2b73..674ea0f 100644
--- a/net/http/transport_security_state_test_util.h
+++ b/net/http/transport_security_state_test_util.h
@@ -24,6 +24,11 @@
// port number of |reporting_port|.
explicit ScopedTransportSecurityStateSource(uint16_t reporting_port);
+ ScopedTransportSecurityStateSource(
+ const ScopedTransportSecurityStateSource&) = delete;
+ ScopedTransportSecurityStateSource& operator=(
+ const ScopedTransportSecurityStateSource&) = delete;
+
~ScopedTransportSecurityStateSource();
private:
@@ -35,8 +40,6 @@
std::vector<TransportSecurityStateSource::Pinset> pinsets_;
std::vector<std::string> expect_ct_report_uri_strings_;
std::vector<const char*> expect_ct_report_uris_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedTransportSecurityStateSource);
};
} // namespace net
diff --git a/net/http/url_security_manager.h b/net/http/url_security_manager.h
index 83fc5e1..2a79a5df 100644
--- a/net/http/url_security_manager.h
+++ b/net/http/url_security_manager.h
@@ -21,6 +21,10 @@
class NET_EXPORT_PRIVATE URLSecurityManager {
public:
URLSecurityManager() {}
+
+ URLSecurityManager(const URLSecurityManager&) = delete;
+ URLSecurityManager& operator=(const URLSecurityManager&) = delete;
+
virtual ~URLSecurityManager() {}
// Creates a platform-dependent instance of URLSecurityManager.
@@ -55,14 +59,16 @@
std::unique_ptr<HttpAuthFilter> allowlist_default) = 0;
virtual void SetDelegateAllowlist(
std::unique_ptr<HttpAuthFilter> allowlist_delegate) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(URLSecurityManager);
};
class URLSecurityManagerAllowlist : public URLSecurityManager {
public:
URLSecurityManagerAllowlist();
+
+ URLSecurityManagerAllowlist(const URLSecurityManagerAllowlist&) = delete;
+ URLSecurityManagerAllowlist& operator=(const URLSecurityManagerAllowlist&) =
+ delete;
+
~URLSecurityManagerAllowlist() override;
// URLSecurityManager methods.
@@ -79,8 +85,6 @@
private:
std::unique_ptr<const HttpAuthFilter> allowlist_default_;
std::unique_ptr<const HttpAuthFilter> allowlist_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(URLSecurityManagerAllowlist);
};
} // namespace net
diff --git a/net/http/url_security_manager_win.cc b/net/http/url_security_manager_win.cc
index 9a61f13..75ac62e8 100644
--- a/net/http/url_security_manager_win.cc
+++ b/net/http/url_security_manager_win.cc
@@ -31,6 +31,10 @@
class URLSecurityManagerWin : public URLSecurityManagerAllowlist {
public:
URLSecurityManagerWin();
+
+ URLSecurityManagerWin(const URLSecurityManagerWin&) = delete;
+ URLSecurityManagerWin& operator=(const URLSecurityManagerWin&) = delete;
+
~URLSecurityManagerWin() override;
// URLSecurityManager methods:
@@ -40,8 +44,6 @@
bool EnsureSystemSecurityManager();
Microsoft::WRL::ComPtr<IInternetSecurityManager> security_manager_;
-
- DISALLOW_COPY_AND_ASSIGN(URLSecurityManagerWin);
};
URLSecurityManagerWin::URLSecurityManagerWin() {}
diff --git a/net/log/file_net_log_observer.cc b/net/log/file_net_log_observer.cc
index cc8ed173..7aca11e9 100644
--- a/net/log/file_net_log_observer.cc
+++ b/net/log/file_net_log_observer.cc
@@ -206,6 +206,9 @@
size_t total_num_event_files,
scoped_refptr<base::SequencedTaskRunner> task_runner);
+ FileWriter(const FileWriter&) = delete;
+ FileWriter& operator=(const FileWriter&) = delete;
+
~FileWriter();
// Writes |constants_value| to disk and opens the events array (closed in
@@ -326,8 +329,6 @@
// Task runner for doing file operations.
const scoped_refptr<base::SequencedTaskRunner> task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(FileWriter);
};
std::unique_ptr<FileNetLogObserver> FileNetLogObserver::CreateBounded(
diff --git a/net/log/file_net_log_observer.h b/net/log/file_net_log_observer.h
index a7a641f..f498aba1 100644
--- a/net/log/file_net_log_observer.h
+++ b/net/log/file_net_log_observer.h
@@ -85,6 +85,9 @@
NetLogCaptureMode capture_mode,
std::unique_ptr<base::Value> constants);
+ FileNetLogObserver(const FileNetLogObserver&) = delete;
+ FileNetLogObserver& operator=(const FileNetLogObserver&) = delete;
+
~FileNetLogObserver() override;
// Attaches this observer to |net_log| and begins observing events.
@@ -157,8 +160,6 @@
std::unique_ptr<FileWriter> file_writer_;
const NetLogCaptureMode capture_mode_;
-
- DISALLOW_COPY_AND_ASSIGN(FileNetLogObserver);
};
// Serializes |value| to a JSON string used when writing to a file.
diff --git a/net/log/net_log_unittest.cc b/net/log/net_log_unittest.cc
index 2d028b3..008b0ac6 100644
--- a/net/log/net_log_unittest.cc
+++ b/net/log/net_log_unittest.cc
@@ -272,6 +272,10 @@
class AddEventsTestThread : public NetLogTestThread {
public:
AddEventsTestThread() = default;
+
+ AddEventsTestThread(const AddEventsTestThread&) = delete;
+ AddEventsTestThread& operator=(const AddEventsTestThread&) = delete;
+
~AddEventsTestThread() override = default;
private:
@@ -279,8 +283,6 @@
for (int i = 0; i < kEvents; ++i)
AddEvent(net_log_);
}
-
- DISALLOW_COPY_AND_ASSIGN(AddEventsTestThread);
};
// A thread that adds and removes an observer from the NetLog repeatedly.
@@ -288,6 +290,10 @@
public:
AddRemoveObserverTestThread() = default;
+ AddRemoveObserverTestThread(const AddRemoveObserverTestThread&) = delete;
+ AddRemoveObserverTestThread& operator=(const AddRemoveObserverTestThread&) =
+ delete;
+
~AddRemoveObserverTestThread() override { EXPECT_TRUE(!observer_.net_log()); }
private:
@@ -305,8 +311,6 @@
}
CountingObserver observer_;
-
- DISALLOW_COPY_AND_ASSIGN(AddRemoveObserverTestThread);
};
// Creates |kThreads| threads of type |ThreadType| and then runs them all
diff --git a/net/log/test_net_log.h b/net/log/test_net_log.h
index f59e23a..bdccd39 100644
--- a/net/log/test_net_log.h
+++ b/net/log/test_net_log.h
@@ -35,6 +35,9 @@
// Observe the specified |net_log| object with |capture_mode|.
RecordingNetLogObserver(NetLog* net_log, NetLogCaptureMode capture_mode);
+ RecordingNetLogObserver(const RecordingNetLogObserver&) = delete;
+ RecordingNetLogObserver& operator=(const RecordingNetLogObserver&) = delete;
+
~RecordingNetLogObserver() override;
// Change the |capture_mode|.
@@ -72,8 +75,6 @@
std::vector<NetLogEntry> entry_list_;
NetLog* const net_log_;
base::RepeatingClosure add_entry_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(RecordingNetLogObserver);
};
// NetLog subclass that follows normal lifetime rules (has a public
@@ -84,10 +85,11 @@
class TestNetLog : public NetLog {
public:
TestNetLog();
- ~TestNetLog() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(TestNetLog);
+ TestNetLog(const TestNetLog&) = delete;
+ TestNetLog& operator=(const TestNetLog&) = delete;
+
+ ~TestNetLog() override;
};
// NetLog subclass that attaches a single observer (this) to record NetLog
@@ -100,6 +102,10 @@
class RecordingTestNetLog : public TestNetLog {
public:
RecordingTestNetLog();
+
+ RecordingTestNetLog(const RecordingTestNetLog&) = delete;
+ RecordingTestNetLog& operator=(const RecordingTestNetLog&) = delete;
+
~RecordingTestNetLog() override;
// These methods all delegate to the underlying RecordingNetLogObserver,
@@ -122,8 +128,6 @@
private:
RecordingNetLogObserver observer_;
-
- DISALLOW_COPY_AND_ASSIGN(RecordingTestNetLog);
};
// Helper class that exposes a similar API as NetLogWithSource, but uses a
@@ -134,6 +138,10 @@
class RecordingBoundTestNetLog {
public:
RecordingBoundTestNetLog();
+
+ RecordingBoundTestNetLog(const RecordingBoundTestNetLog&) = delete;
+ RecordingBoundTestNetLog& operator=(const RecordingBoundTestNetLog&) = delete;
+
~RecordingBoundTestNetLog();
// The returned NetLogWithSource is only valid while |this| is alive.
@@ -155,8 +163,6 @@
private:
RecordingTestNetLog test_net_log_;
const NetLogWithSource net_log_;
-
- DISALLOW_COPY_AND_ASSIGN(RecordingBoundTestNetLog);
};
} // namespace net
diff --git a/net/log/trace_net_log_observer.h b/net/log/trace_net_log_observer.h
index eea49c8..dfa2b5dd 100644
--- a/net/log/trace_net_log_observer.h
+++ b/net/log/trace_net_log_observer.h
@@ -20,6 +20,10 @@
public base::trace_event::TraceLog::AsyncEnabledStateObserver {
public:
TraceNetLogObserver();
+
+ TraceNetLogObserver(const TraceNetLogObserver&) = delete;
+ TraceNetLogObserver& operator=(const TraceNetLogObserver&) = delete;
+
~TraceNetLogObserver() override;
// net::NetLog::ThreadSafeObserver implementation:
@@ -42,8 +46,6 @@
private:
NetLog* net_log_to_watch_;
base::WeakPtrFactory<TraceNetLogObserver> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TraceNetLogObserver);
};
} // namespace net
diff --git a/net/network_error_logging/mock_persistent_nel_store.h b/net/network_error_logging/mock_persistent_nel_store.h
index 15af5fa..45e2047 100644
--- a/net/network_error_logging/mock_persistent_nel_store.h
+++ b/net/network_error_logging/mock_persistent_nel_store.h
@@ -59,6 +59,10 @@
using CommandList = std::vector<Command>;
MockPersistentNelStore();
+
+ MockPersistentNelStore(const MockPersistentNelStore&) = delete;
+ MockPersistentNelStore& operator=(const MockPersistentNelStore&) = delete;
+
~MockPersistentNelStore() override;
// PersistentNelStore implementation:
@@ -110,8 +114,6 @@
// Simulates the delta to be added to |policy_count_| the next time Flush() is
// called. Reset to 0 when Flush() is called.
int queued_policy_count_delta_;
-
- DISALLOW_COPY_AND_ASSIGN(MockPersistentNelStore);
};
bool operator==(const MockPersistentNelStore::Command& lhs,
diff --git a/net/network_error_logging/network_error_logging_service.h b/net/network_error_logging/network_error_logging_service.h
index 9d560d5..77b5bfb 100644
--- a/net/network_error_logging/network_error_logging_service.h
+++ b/net/network_error_logging/network_error_logging_service.h
@@ -219,6 +219,10 @@
static std::unique_ptr<NetworkErrorLoggingService> Create(
PersistentNelStore* store);
+ NetworkErrorLoggingService(const NetworkErrorLoggingService&) = delete;
+ NetworkErrorLoggingService& operator=(const NetworkErrorLoggingService&) =
+ delete;
+
virtual ~NetworkErrorLoggingService();
// Ingests a "NEL:" header received for |network_isolation_key| and |origin|
@@ -289,9 +293,6 @@
const base::Clock* clock_;
ReportingService* reporting_service_;
bool shut_down_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetworkErrorLoggingService);
};
// Persistent storage for NEL policies.
@@ -301,6 +302,10 @@
base::OnceCallback<void(std::vector<NelPolicy>)>;
PersistentNelStore() = default;
+
+ PersistentNelStore(const PersistentNelStore&) = delete;
+ PersistentNelStore& operator=(const PersistentNelStore&) = delete;
+
virtual ~PersistentNelStore() = default;
// Initializes the store and retrieves stored NEL policies. This will be
@@ -318,9 +323,6 @@
// Flushes the store.
virtual void Flush() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PersistentNelStore);
};
} // namespace net
diff --git a/net/network_error_logging/network_error_logging_test_util.h b/net/network_error_logging/network_error_logging_test_util.h
index df9c422d..bad38116 100644
--- a/net/network_error_logging/network_error_logging_test_util.h
+++ b/net/network_error_logging/network_error_logging_test_util.h
@@ -39,6 +39,12 @@
};
TestNetworkErrorLoggingService();
+
+ TestNetworkErrorLoggingService(const TestNetworkErrorLoggingService&) =
+ delete;
+ TestNetworkErrorLoggingService& operator=(
+ const TestNetworkErrorLoggingService&) = delete;
+
~TestNetworkErrorLoggingService() override;
const std::vector<Header>& headers() { return headers_; }
@@ -58,8 +64,6 @@
private:
std::vector<Header> headers_;
std::vector<RequestDetails> errors_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNetworkErrorLoggingService);
};
} // namespace net
diff --git a/net/nqe/event_creator.h b/net/nqe/event_creator.h
index 74f6ae50..b71c0d5 100644
--- a/net/nqe/event_creator.h
+++ b/net/nqe/event_creator.h
@@ -26,6 +26,10 @@
class NET_EXPORT_PRIVATE EventCreator {
public:
explicit EventCreator(NetLogWithSource net_log);
+
+ EventCreator(const EventCreator&) = delete;
+ EventCreator& operator=(const EventCreator&) = delete;
+
~EventCreator();
// May add network quality changed event to the net-internals log if there
@@ -47,8 +51,6 @@
NetworkQuality past_network_quality_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(EventCreator);
};
} // namespace internal
diff --git a/net/nqe/network_qualities_prefs_manager.h b/net/nqe/network_qualities_prefs_manager.h
index adc2073f..dcdef8f 100644
--- a/net/nqe/network_qualities_prefs_manager.h
+++ b/net/nqe/network_qualities_prefs_manager.h
@@ -45,6 +45,11 @@
// |pref_delegate| is taken by this class.
explicit NetworkQualitiesPrefsManager(
std::unique_ptr<PrefDelegate> pref_delegate);
+
+ NetworkQualitiesPrefsManager(const NetworkQualitiesPrefsManager&) = delete;
+ NetworkQualitiesPrefsManager& operator=(const NetworkQualitiesPrefsManager&) =
+ delete;
+
~NetworkQualitiesPrefsManager() override;
// Initialize on the Network thread. Must be called after pref service has
@@ -82,8 +87,6 @@
ParsedPrefs read_prefs_startup_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(NetworkQualitiesPrefsManager);
};
} // namespace net
diff --git a/net/nqe/network_qualities_prefs_manager_unittest.cc b/net/nqe/network_qualities_prefs_manager_unittest.cc
index 873e9360..6f6d8e0 100644
--- a/net/nqe/network_qualities_prefs_manager_unittest.cc
+++ b/net/nqe/network_qualities_prefs_manager_unittest.cc
@@ -31,6 +31,9 @@
TestPrefDelegate()
: write_count_(0), read_count_(0), value_(new base::DictionaryValue) {}
+ TestPrefDelegate(const TestPrefDelegate&) = delete;
+ TestPrefDelegate& operator=(const TestPrefDelegate&) = delete;
+
~TestPrefDelegate() override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
value_->Clear();
@@ -71,8 +74,6 @@
std::unique_ptr<base::DictionaryValue> value_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TestPrefDelegate);
};
using NetworkQualitiesPrefManager = TestWithTaskEnvironment;
diff --git a/net/nqe/network_quality_estimator_params.h b/net/nqe/network_quality_estimator_params.h
index dc830f8..9d0bd89 100644
--- a/net/nqe/network_quality_estimator_params.h
+++ b/net/nqe/network_quality_estimator_params.h
@@ -36,6 +36,10 @@
explicit NetworkQualityEstimatorParams(
const std::map<std::string, std::string>& params);
+ NetworkQualityEstimatorParams(const NetworkQualityEstimatorParams&) = delete;
+ NetworkQualityEstimatorParams& operator=(
+ const NetworkQualityEstimatorParams&) = delete;
+
~NetworkQualityEstimatorParams();
// Returns the default observation for connection |type|. The default
@@ -303,8 +307,6 @@
[EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_LAST];
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(NetworkQualityEstimatorParams);
};
} // namespace net
diff --git a/net/nqe/network_quality_estimator_test_util.h b/net/nqe/network_quality_estimator_test_util.h
index dae3df73..60615c5 100644
--- a/net/nqe/network_quality_estimator_test_util.h
+++ b/net/nqe/network_quality_estimator_test_util.h
@@ -52,6 +52,10 @@
explicit TestNetworkQualityEstimator(
std::unique_ptr<NetworkQualityEstimatorParams> params);
+ TestNetworkQualityEstimator(const TestNetworkQualityEstimator&) = delete;
+ TestNetworkQualityEstimator& operator=(const TestNetworkQualityEstimator&) =
+ delete;
+
~TestNetworkQualityEstimator() override;
// Runs one URL request to completion.
@@ -286,8 +290,6 @@
size_t ping_rtt_received_count_ = 0;
absl::optional<size_t> transport_rtt_observation_count_last_ect_computation_;
-
- DISALLOW_COPY_AND_ASSIGN(TestNetworkQualityEstimator);
};
} // namespace net
diff --git a/net/nqe/network_quality_estimator_unittest.cc b/net/nqe/network_quality_estimator_unittest.cc
index e87a9f4..c664408 100644
--- a/net/nqe/network_quality_estimator_unittest.cc
+++ b/net/nqe/network_quality_estimator_unittest.cc
@@ -2187,6 +2187,12 @@
std::string(),
INT32_MIN),
notification_received_(0) {}
+
+ TestNetworkQualitiesCacheObserver(const TestNetworkQualitiesCacheObserver&) =
+ delete;
+ TestNetworkQualitiesCacheObserver& operator=(
+ const TestNetworkQualitiesCacheObserver&) = delete;
+
~TestNetworkQualitiesCacheObserver() override = default;
void OnChangeInCachedNetworkQuality(
@@ -2208,7 +2214,6 @@
private:
nqe::internal::NetworkID network_id_;
size_t notification_received_;
- DISALLOW_COPY_AND_ASSIGN(TestNetworkQualitiesCacheObserver);
};
TEST_F(NetworkQualityEstimatorTest, CacheObserver) {
diff --git a/net/nqe/rtt_throughput_estimates_observer.h b/net/nqe/rtt_throughput_estimates_observer.h
index 27f9043..ecd93efb 100644
--- a/net/nqe/rtt_throughput_estimates_observer.h
+++ b/net/nqe/rtt_throughput_estimates_observer.h
@@ -34,13 +34,15 @@
base::TimeDelta transport_rtt,
int32_t downstream_throughput_kbps) = 0;
+ RTTAndThroughputEstimatesObserver(const RTTAndThroughputEstimatesObserver&) =
+ delete;
+ RTTAndThroughputEstimatesObserver& operator=(
+ const RTTAndThroughputEstimatesObserver&) = delete;
+
virtual ~RTTAndThroughputEstimatesObserver() {}
protected:
RTTAndThroughputEstimatesObserver() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(RTTAndThroughputEstimatesObserver);
};
} // namespace net
diff --git a/net/nqe/socket_watcher.h b/net/nqe/socket_watcher.h
index 07abb55..fc6e92b 100644
--- a/net/nqe/socket_watcher.h
+++ b/net/nqe/socket_watcher.h
@@ -66,6 +66,9 @@
ShouldNotifyRTTCallback should_notify_rtt_callback,
const base::TickClock* tick_clock);
+ SocketWatcher(const SocketWatcher&) = delete;
+ SocketWatcher& operator=(const SocketWatcher&) = delete;
+
~SocketWatcher() override;
// SocketPerformanceWatcher implementation:
@@ -106,8 +109,6 @@
// A unique identifier for the remote host that this socket connects to.
const absl::optional<IPHash> host_;
-
- DISALLOW_COPY_AND_ASSIGN(SocketWatcher);
};
} // namespace internal
diff --git a/net/nqe/socket_watcher_factory.h b/net/nqe/socket_watcher_factory.h
index 88c5bbaf..68818bd 100644
--- a/net/nqe/socket_watcher_factory.h
+++ b/net/nqe/socket_watcher_factory.h
@@ -60,6 +60,9 @@
ShouldNotifyRTTCallback should_notify_rtt_callback,
const base::TickClock* tick_clock);
+ SocketWatcherFactory(const SocketWatcherFactory&) = delete;
+ SocketWatcherFactory& operator=(const SocketWatcherFactory&) = delete;
+
~SocketWatcherFactory() override;
// SocketPerformanceWatcherFactory implementation:
@@ -93,8 +96,6 @@
ShouldNotifyRTTCallback should_notify_rtt_callback_;
const base::TickClock* tick_clock_;
-
- DISALLOW_COPY_AND_ASSIGN(SocketWatcherFactory);
};
} // namespace internal
diff --git a/net/nqe/throughput_analyzer.h b/net/nqe/throughput_analyzer.h
index c6ec2438e..cde4d56 100644
--- a/net/nqe/throughput_analyzer.h
+++ b/net/nqe/throughput_analyzer.h
@@ -67,6 +67,10 @@
ThroughputObservationCallback throughput_observation_callback,
const base::TickClock* tick_clock,
const NetLogWithSource& net_log);
+
+ ThroughputAnalyzer(const ThroughputAnalyzer&) = delete;
+ ThroughputAnalyzer& operator=(const ThroughputAnalyzer&) = delete;
+
virtual ~ThroughputAnalyzer();
// Notifies |this| that the headers of |request| are about to be sent.
@@ -247,8 +251,6 @@
SEQUENCE_CHECKER(sequence_checker_);
NetLogWithSource net_log_;
-
- DISALLOW_COPY_AND_ASSIGN(ThroughputAnalyzer);
};
} // namespace internal
diff --git a/net/nqe/throughput_analyzer_unittest.cc b/net/nqe/throughput_analyzer_unittest.cc
index 758a4910..3684215 100644
--- a/net/nqe/throughput_analyzer_unittest.cc
+++ b/net/nqe/throughput_analyzer_unittest.cc
@@ -67,6 +67,9 @@
throughput_observations_received_(0),
bits_received_(0) {}
+ TestThroughputAnalyzer(const TestThroughputAnalyzer&) = delete;
+ TestThroughputAnalyzer& operator=(const TestThroughputAnalyzer&) = delete;
+
~TestThroughputAnalyzer() override = default;
int32_t throughput_observations_received() const {
@@ -112,8 +115,6 @@
int64_t bits_received_;
MockCachingHostResolver mock_host_resolver_;
-
- DISALLOW_COPY_AND_ASSIGN(TestThroughputAnalyzer);
};
using ThroughputAnalyzerTest = TestWithTaskEnvironment;
diff --git a/net/ntlm/ntlm_buffer_writer.h b/net/ntlm/ntlm_buffer_writer.h
index f4535e63..9818bb7 100644
--- a/net/ntlm/ntlm_buffer_writer.h
+++ b/net/ntlm/ntlm_buffer_writer.h
@@ -44,6 +44,10 @@
class NET_EXPORT_PRIVATE NtlmBufferWriter {
public:
explicit NtlmBufferWriter(size_t buffer_len);
+
+ NtlmBufferWriter(const NtlmBufferWriter&) = delete;
+ NtlmBufferWriter& operator=(const NtlmBufferWriter&) = delete;
+
~NtlmBufferWriter();
size_t GetLength() const { return buffer_.size(); }
@@ -186,8 +190,6 @@
std::vector<uint8_t> buffer_;
size_t cursor_;
-
- DISALLOW_COPY_AND_ASSIGN(NtlmBufferWriter);
};
} // namespace ntlm
diff --git a/net/ntlm/ntlm_client.h b/net/ntlm/ntlm_client.h
index 27b00bb..c295efd 100644
--- a/net/ntlm/ntlm_client.h
+++ b/net/ntlm/ntlm_client.h
@@ -42,6 +42,9 @@
// Integrity Check (MIC).
explicit NtlmClient(NtlmFeatures features);
+ NtlmClient(const NtlmClient&) = delete;
+ NtlmClient& operator=(const NtlmClient&) = delete;
+
~NtlmClient();
bool IsNtlmV2() const { return features_.enable_NTLMv2; }
@@ -150,8 +153,6 @@
const NtlmFeatures features_;
NegotiateFlags negotiate_flags_;
std::vector<uint8_t> negotiate_message_;
-
- DISALLOW_COPY_AND_ASSIGN(NtlmClient);
};
} // namespace ntlm
diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc
index 7eeec29..e1c2293 100644
--- a/net/proxy_resolution/configured_proxy_resolution_service.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
@@ -415,6 +415,9 @@
next_state_(State::kNone),
quick_check_enabled_(true) {}
+ InitProxyResolver(const InitProxyResolver&) = delete;
+ InitProxyResolver& operator=(const InitProxyResolver&) = delete;
+
// Note that the destruction of PacFileDecider will automatically cancel
// any outstanding work.
~InitProxyResolver() = default;
@@ -597,8 +600,6 @@
CompletionOnceCallback callback_;
State next_state_;
bool quick_check_enabled_;
-
- DISALLOW_COPY_AND_ASSIGN(InitProxyResolver);
};
// ConfiguredProxyResolutionService::PacFileDeciderPoller
diff --git a/net/proxy_resolution/configured_proxy_resolution_service.h b/net/proxy_resolution/configured_proxy_resolution_service.h
index 1174be7..693da97 100644
--- a/net/proxy_resolution/configured_proxy_resolution_service.h
+++ b/net/proxy_resolution/configured_proxy_resolution_service.h
@@ -108,6 +108,11 @@
NetLog* net_log,
bool quick_check_enabled);
+ ConfiguredProxyResolutionService(const ConfiguredProxyResolutionService&) =
+ delete;
+ ConfiguredProxyResolutionService& operator=(
+ const ConfiguredProxyResolutionService&) = delete;
+
~ConfiguredProxyResolutionService() override;
// ProxyResolutionService
@@ -415,8 +420,6 @@
// synchronous callback.
base::WeakPtrFactory<ConfiguredProxyResolutionService> weak_ptr_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(ConfiguredProxyResolutionService);
};
} // namespace net
diff --git a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
index 409b26d..8cc1a6d 100644
--- a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
+++ b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
@@ -514,6 +514,10 @@
class DeletingCallback : public TestCompletionCallbackBase {
public:
explicit DeletingCallback(std::unique_ptr<T>* deletee);
+
+ DeletingCallback(const DeletingCallback&) = delete;
+ DeletingCallback& operator=(const DeletingCallback&) = delete;
+
~DeletingCallback() override;
CompletionOnceCallback callback() {
@@ -528,8 +532,6 @@
}
std::unique_ptr<T>* deletee_;
-
- DISALLOW_COPY_AND_ASSIGN(DeletingCallback);
};
template <typename T>
diff --git a/net/proxy_resolution/dhcp_pac_file_fetcher.h b/net/proxy_resolution/dhcp_pac_file_fetcher.h
index d3abf1e..68273b99 100644
--- a/net/proxy_resolution/dhcp_pac_file_fetcher.h
+++ b/net/proxy_resolution/dhcp_pac_file_fetcher.h
@@ -29,6 +29,9 @@
// which PAC script to use if one or more are available.
class NET_EXPORT_PRIVATE DhcpPacFileFetcher {
public:
+ DhcpPacFileFetcher(const DhcpPacFileFetcher&) = delete;
+ DhcpPacFileFetcher& operator=(const DhcpPacFileFetcher&) = delete;
+
// Destruction should cancel any outstanding requests.
virtual ~DhcpPacFileFetcher();
@@ -84,9 +87,6 @@
protected:
DhcpPacFileFetcher();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DhcpPacFileFetcher);
};
// A do-nothing retriever, always returns synchronously with
@@ -95,6 +95,11 @@
: public DhcpPacFileFetcher {
public:
DoNothingDhcpPacFileFetcher();
+
+ DoNothingDhcpPacFileFetcher(const DoNothingDhcpPacFileFetcher&) = delete;
+ DoNothingDhcpPacFileFetcher& operator=(const DoNothingDhcpPacFileFetcher&) =
+ delete;
+
~DoNothingDhcpPacFileFetcher() override;
int Fetch(std::u16string* utf16_text,
@@ -108,7 +113,6 @@
private:
GURL gurl_;
- DISALLOW_COPY_AND_ASSIGN(DoNothingDhcpPacFileFetcher);
};
} // namespace net
diff --git a/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc b/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc
index 0c36dad..98cdd8d6 100644
--- a/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc
@@ -111,6 +111,9 @@
BlockableProxyResolver() : state_(State::NONE), condition_(&lock_) {}
+ BlockableProxyResolver(const BlockableProxyResolver&) = delete;
+ BlockableProxyResolver& operator=(const BlockableProxyResolver&) = delete;
+
~BlockableProxyResolver() override {
base::AutoLock lock(lock_);
EXPECT_NE(State::BLOCKED, state_);
@@ -170,8 +173,6 @@
State state_;
base::Lock lock_;
base::ConditionVariable condition_;
-
- DISALLOW_COPY_AND_ASSIGN(BlockableProxyResolver);
};
// This factory returns new instances of BlockableProxyResolver.
diff --git a/net/proxy_resolution/network_delegate_error_observer.h b/net/proxy_resolution/network_delegate_error_observer.h
index 67534c3..7bd3f0a5 100644
--- a/net/proxy_resolution/network_delegate_error_observer.h
+++ b/net/proxy_resolution/network_delegate_error_observer.h
@@ -28,6 +28,11 @@
public:
NetworkDelegateErrorObserver(NetworkDelegate* network_delegate,
base::SingleThreadTaskRunner* origin_runner);
+
+ NetworkDelegateErrorObserver(const NetworkDelegateErrorObserver&) = delete;
+ NetworkDelegateErrorObserver& operator=(const NetworkDelegateErrorObserver&) =
+ delete;
+
~NetworkDelegateErrorObserver() override;
static std::unique_ptr<ProxyResolverErrorObserver> Create(
@@ -41,8 +46,6 @@
class Core;
scoped_refptr<Core> core_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkDelegateErrorObserver);
};
} // namespace net
diff --git a/net/proxy_resolution/pac_file_decider.h b/net/proxy_resolution/pac_file_decider.h
index 570ca92..220c71d 100644
--- a/net/proxy_resolution/pac_file_decider.h
+++ b/net/proxy_resolution/pac_file_decider.h
@@ -79,6 +79,9 @@
DhcpPacFileFetcher* dhcp_pac_file_fetcher,
NetLog* net_log);
+ PacFileDecider(const PacFileDecider&) = delete;
+ PacFileDecider& operator=(const PacFileDecider&) = delete;
+
// Aborts any in-progress request.
~PacFileDecider();
@@ -217,8 +220,6 @@
std::unique_ptr<HostResolver::ResolveHostRequest> resolve_request_;
base::OneShotTimer quick_check_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(PacFileDecider);
};
} // namespace net
diff --git a/net/proxy_resolution/pac_file_decider_unittest.cc b/net/proxy_resolution/pac_file_decider_unittest.cc
index 621ebfa7..bfbc8331 100644
--- a/net/proxy_resolution/pac_file_decider_unittest.cc
+++ b/net/proxy_resolution/pac_file_decider_unittest.cc
@@ -137,6 +137,10 @@
class MockDhcpPacFileFetcher : public DhcpPacFileFetcher {
public:
MockDhcpPacFileFetcher();
+
+ MockDhcpPacFileFetcher(const MockDhcpPacFileFetcher&) = delete;
+ MockDhcpPacFileFetcher& operator=(const MockDhcpPacFileFetcher&) = delete;
+
~MockDhcpPacFileFetcher() override;
int Fetch(std::u16string* utf16_text,
@@ -155,7 +159,6 @@
CompletionOnceCallback callback_;
std::u16string* utf16_text_;
GURL gurl_;
- DISALLOW_COPY_AND_ASSIGN(MockDhcpPacFileFetcher);
};
MockDhcpPacFileFetcher::MockDhcpPacFileFetcher() = default;
diff --git a/net/proxy_resolution/pac_file_fetcher_impl.h b/net/proxy_resolution/pac_file_fetcher_impl.h
index f11c4af2..74b1b8a 100644
--- a/net/proxy_resolution/pac_file_fetcher_impl.h
+++ b/net/proxy_resolution/pac_file_fetcher_impl.h
@@ -49,6 +49,9 @@
static std::unique_ptr<PacFileFetcherImpl> Create(
URLRequestContext* url_request_context);
+ PacFileFetcherImpl(const PacFileFetcherImpl&) = delete;
+ PacFileFetcherImpl& operator=(const PacFileFetcherImpl&) = delete;
+
~PacFileFetcherImpl() override;
// Used by unit-tests to modify the default limits.
@@ -151,8 +154,6 @@
// Factory for creating the time-out task. This takes care of revoking
// outstanding tasks when |this| is deleted.
base::WeakPtrFactory<PacFileFetcherImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(PacFileFetcherImpl);
};
} // namespace net
diff --git a/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc b/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc
index 6576325..4c33a92 100644
--- a/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc
+++ b/net/proxy_resolution/pac_file_fetcher_impl_unittest.cc
@@ -135,6 +135,10 @@
class BasicNetworkDelegate : public NetworkDelegateImpl {
public:
BasicNetworkDelegate() = default;
+
+ BasicNetworkDelegate(const BasicNetworkDelegate&) = delete;
+ BasicNetworkDelegate& operator=(const BasicNetworkDelegate&) = delete;
+
~BasicNetworkDelegate() override = default;
private:
@@ -144,8 +148,6 @@
EXPECT_TRUE(request->load_flags() & LOAD_DISABLE_CERT_NETWORK_FETCHES);
return OK;
}
-
- DISALLOW_COPY_AND_ASSIGN(BasicNetworkDelegate);
};
class PacFileFetcherImplTest : public PlatformTest, public WithTaskEnvironment {
diff --git a/net/proxy_resolution/proxy_config_service_android.h b/net/proxy_resolution/proxy_config_service_android.h
index 6bb0ad2..d20cfa7 100644
--- a/net/proxy_resolution/proxy_config_service_android.h
+++ b/net/proxy_resolution/proxy_config_service_android.h
@@ -62,6 +62,10 @@
const scoped_refptr<base::SequencedTaskRunner>& main_task_runner,
const scoped_refptr<base::SequencedTaskRunner>& jni_task_runner);
+ ProxyConfigServiceAndroid(const ProxyConfigServiceAndroid&) = delete;
+ ProxyConfigServiceAndroid& operator=(const ProxyConfigServiceAndroid&) =
+ delete;
+
~ProxyConfigServiceAndroid() override;
// Android provides a local HTTP proxy that does PAC resolution. When this
@@ -127,8 +131,6 @@
const std::vector<std::string>& exclusion_list);
scoped_refptr<Delegate> delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid);
};
} // namespace net
diff --git a/net/proxy_resolution/proxy_config_service_ios.h b/net/proxy_resolution/proxy_config_service_ios.h
index a56054b..bbb1c40 100644
--- a/net/proxy_resolution/proxy_config_service_ios.h
+++ b/net/proxy_resolution/proxy_config_service_ios.h
@@ -15,10 +15,11 @@
// Constructs a ProxyConfigService that watches the iOS system proxy settings.
explicit ProxyConfigServiceIOS(
const NetworkTrafficAnnotationTag& traffic_annotation);
- ~ProxyConfigServiceIOS() override;
- private:
- DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceIOS);
+ ProxyConfigServiceIOS(const ProxyConfigServiceIOS&) = delete;
+ ProxyConfigServiceIOS& operator=(const ProxyConfigServiceIOS&) = delete;
+
+ ~ProxyConfigServiceIOS() override;
};
} // namespace net
diff --git a/net/proxy_resolution/proxy_config_service_linux.cc b/net/proxy_resolution/proxy_config_service_linux.cc
index afa3eb0..7b74e4f 100644
--- a/net/proxy_resolution/proxy_config_service_linux.cc
+++ b/net/proxy_resolution/proxy_config_service_linux.cc
@@ -245,6 +245,10 @@
notify_delegate_(nullptr),
debounce_timer_(new base::OneShotTimer()) {}
+ SettingGetterImplGSettings(const SettingGetterImplGSettings&) = delete;
+ SettingGetterImplGSettings& operator=(const SettingGetterImplGSettings&) =
+ delete;
+
~SettingGetterImplGSettings() override {
// client_ should have been released before now, from
// Delegate::OnDestroy(), while running on the UI thread. However
@@ -479,8 +483,6 @@
// be the UI thread and all our methods should be called on this
// thread. Only for assertions.
scoped_refptr<base::SequencedTaskRunner> task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(SettingGetterImplGSettings);
};
bool SettingGetterImplGSettings::CheckVersion(
@@ -586,6 +588,9 @@
}
}
+ SettingGetterImplKDE(const SettingGetterImplKDE&) = delete;
+ SettingGetterImplKDE& operator=(const SettingGetterImplKDE&) = delete;
+
~SettingGetterImplKDE() override {
// inotify_fd_ should have been closed before now, from
// Delegate::OnDestroy(), while running on the file thread. However
@@ -1001,8 +1006,6 @@
// Task runner for doing blocking file IO on, as well as handling inotify
// events on.
scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
-
- DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE);
};
} // namespace
diff --git a/net/proxy_resolution/proxy_config_service_linux.h b/net/proxy_resolution/proxy_config_service_linux.h
index fbaa70be..5ecbc3c 100644
--- a/net/proxy_resolution/proxy_config_service_linux.h
+++ b/net/proxy_resolution/proxy_config_service_linux.h
@@ -42,6 +42,10 @@
static const size_t BUFFER_SIZE = 512;
SettingGetter() {}
+
+ SettingGetter(const SettingGetter&) = delete;
+ SettingGetter& operator=(const SettingGetter&) = delete;
+
virtual ~SettingGetter() {}
// Initializes the class: obtains a gconf/gsettings client, or simulates
@@ -137,9 +141,6 @@
// considered a match for "google.com", even though the bypass rule does not
// include a wildcard, and the matched host is not a subdomain.
virtual bool UseSuffixMatching() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SettingGetter);
};
// ProxyConfigServiceLinux is created on the glib thread, and
diff --git a/net/proxy_resolution/proxy_config_service_mac.h b/net/proxy_resolution/proxy_config_service_mac.h
index 8c6d0552..610a32a 100644
--- a/net/proxy_resolution/proxy_config_service_mac.h
+++ b/net/proxy_resolution/proxy_config_service_mac.h
@@ -29,6 +29,10 @@
explicit ProxyConfigServiceMac(
const scoped_refptr<base::SequencedTaskRunner>& sequenced_task_runner,
const NetworkTrafficAnnotationTag& traffic_annotation);
+
+ ProxyConfigServiceMac(const ProxyConfigServiceMac&) = delete;
+ ProxyConfigServiceMac& operator=(const ProxyConfigServiceMac&) = delete;
+
~ProxyConfigServiceMac() override;
public:
@@ -80,8 +84,6 @@
const scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
const NetworkTrafficAnnotationTag traffic_annotation_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceMac);
};
} // namespace net
diff --git a/net/proxy_resolution/proxy_resolver.h b/net/proxy_resolution/proxy_resolver.h
index 7b54e57..84e85b0 100644
--- a/net/proxy_resolution/proxy_resolver.h
+++ b/net/proxy_resolution/proxy_resolver.h
@@ -34,6 +34,9 @@
ProxyResolver() {}
+ ProxyResolver(const ProxyResolver&) = delete;
+ ProxyResolver& operator=(const ProxyResolver&) = delete;
+
virtual ~ProxyResolver() {}
// Gets a list of proxy servers to use for |url|. If the request will
@@ -52,9 +55,6 @@
CompletionOnceCallback callback,
std::unique_ptr<Request>* request,
const NetLogWithSource& net_log) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProxyResolver);
};
} // namespace net
diff --git a/net/proxy_resolution/proxy_resolver_error_observer.h b/net/proxy_resolution/proxy_resolver_error_observer.h
index ea1dbc7..bf69b7a 100644
--- a/net/proxy_resolution/proxy_resolver_error_observer.h
+++ b/net/proxy_resolution/proxy_resolver_error_observer.h
@@ -16,6 +16,11 @@
class NET_EXPORT_PRIVATE ProxyResolverErrorObserver {
public:
ProxyResolverErrorObserver() {}
+
+ ProxyResolverErrorObserver(const ProxyResolverErrorObserver&) = delete;
+ ProxyResolverErrorObserver& operator=(const ProxyResolverErrorObserver&) =
+ delete;
+
virtual ~ProxyResolverErrorObserver() {}
// Handler for when an error is encountered. |line_number| may be -1
@@ -28,9 +33,6 @@
// thread than the proxy resolver's origin thread.
virtual void OnPACScriptError(int line_number,
const std::u16string& error) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ProxyResolverErrorObserver);
};
} // namespace net
diff --git a/net/proxy_resolution/proxy_resolver_factory.h b/net/proxy_resolution/proxy_resolver_factory.h
index 25ae651..c295962 100644
--- a/net/proxy_resolution/proxy_resolver_factory.h
+++ b/net/proxy_resolution/proxy_resolver_factory.h
@@ -30,6 +30,9 @@
// See |expects_pac_bytes()| for the meaning of |expects_pac_bytes|.
explicit ProxyResolverFactory(bool expects_pac_bytes);
+ ProxyResolverFactory(const ProxyResolverFactory&) = delete;
+ ProxyResolverFactory& operator=(const ProxyResolverFactory&) = delete;
+
virtual ~ProxyResolverFactory();
// Creates a new ProxyResolver. If the request will complete asynchronously,
@@ -51,8 +54,6 @@
private:
bool expects_pac_bytes_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyResolverFactory);
};
} // namespace net
diff --git a/net/proxy_resolution/proxy_resolver_mac.cc b/net/proxy_resolution/proxy_resolver_mac.cc
index 7ef110e8..9b32cc6d 100644
--- a/net/proxy_resolution/proxy_resolver_mac.cc
+++ b/net/proxy_resolution/proxy_resolver_mac.cc
@@ -100,6 +100,11 @@
// Creates the instance of an observer that will synchronize the sources
// using a given |lock|.
SynchronizedRunLoopObserver(base::Lock& lock);
+
+ SynchronizedRunLoopObserver(const SynchronizedRunLoopObserver&) = delete;
+ SynchronizedRunLoopObserver& operator=(const SynchronizedRunLoopObserver&) =
+ delete;
+
// Destructor.
~SynchronizedRunLoopObserver();
// Adds the observer to the current run loop for a given run loop mode.
@@ -122,7 +127,6 @@
base::ScopedCFTypeRef<CFRunLoopObserverRef> observer_;
// Validates that all methods of this class are executed on the same thread.
base::ThreadChecker thread_checker_;
- DISALLOW_COPY_AND_ASSIGN(SynchronizedRunLoopObserver);
};
SynchronizedRunLoopObserver::SynchronizedRunLoopObserver(base::Lock& lock)
diff --git a/net/proxy_resolution/win/proxy_resolver_winhttp.cc b/net/proxy_resolution/win/proxy_resolver_winhttp.cc
index cd9462c..7fd7ef4e 100644
--- a/net/proxy_resolution/win/proxy_resolver_winhttp.cc
+++ b/net/proxy_resolution/win/proxy_resolver_winhttp.cc
@@ -55,6 +55,10 @@
class ProxyResolverWinHttp : public ProxyResolver {
public:
ProxyResolverWinHttp(const scoped_refptr<PacFileData>& script_data);
+
+ ProxyResolverWinHttp(const ProxyResolverWinHttp&) = delete;
+ ProxyResolverWinHttp& operator=(const ProxyResolverWinHttp&) = delete;
+
~ProxyResolverWinHttp() override;
// ProxyResolver implementation:
@@ -73,8 +77,6 @@
HINTERNET session_handle_;
const GURL pac_url_;
-
- DISALLOW_COPY_AND_ASSIGN(ProxyResolverWinHttp);
};
ProxyResolverWinHttp::ProxyResolverWinHttp(
diff --git a/net/quic/bidirectional_stream_quic_impl.h b/net/quic/bidirectional_stream_quic_impl.h
index 7622b63..dd064cc3 100644
--- a/net/quic/bidirectional_stream_quic_impl.h
+++ b/net/quic/bidirectional_stream_quic_impl.h
@@ -34,6 +34,10 @@
explicit BidirectionalStreamQuicImpl(
std::unique_ptr<QuicChromiumClientSession::Handle> session);
+ BidirectionalStreamQuicImpl(const BidirectionalStreamQuicImpl&) = delete;
+ BidirectionalStreamQuicImpl& operator=(const BidirectionalStreamQuicImpl&) =
+ delete;
+
~BidirectionalStreamQuicImpl() override;
// BidirectionalStreamImpl implementation:
@@ -129,8 +133,6 @@
bool may_invoke_callbacks_;
base::WeakPtrFactory<BidirectionalStreamQuicImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BidirectionalStreamQuicImpl);
};
} // namespace net
diff --git a/net/quic/bidirectional_stream_quic_impl_unittest.cc b/net/quic/bidirectional_stream_quic_impl_unittest.cc
index 83cedfda..7c95157 100644
--- a/net/quic/bidirectional_stream_quic_impl_unittest.cc
+++ b/net/quic/bidirectional_stream_quic_impl_unittest.cc
@@ -140,6 +140,9 @@
loop_ = std::make_unique<base::RunLoop>();
}
+ TestDelegateBase(const TestDelegateBase&) = delete;
+ TestDelegateBase& operator=(const TestDelegateBase&) = delete;
+
~TestDelegateBase() override {}
void OnStreamReady(bool request_headers_sent) override {
@@ -351,8 +354,6 @@
bool is_ready_;
bool trailers_expected_;
bool trailers_received_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDelegateBase);
};
// A delegate that deletes the stream in a particular callback.
@@ -369,6 +370,10 @@
DeleteStreamDelegate(IOBuffer* buf, int buf_len, Phase phase)
: TestDelegateBase(buf, buf_len), phase_(phase) {}
+
+ DeleteStreamDelegate(const DeleteStreamDelegate&) = delete;
+ DeleteStreamDelegate& operator=(const DeleteStreamDelegate&) = delete;
+
~DeleteStreamDelegate() override {}
void OnStreamReady(bool request_headers_sent) override {
@@ -417,8 +422,6 @@
// Indicates in which callback the delegate should cancel or delete the
// stream.
Phase phase_;
-
- DISALLOW_COPY_AND_ASSIGN(DeleteStreamDelegate);
};
} // namespace
diff --git a/net/quic/crypto/proof_source_chromium.h b/net/quic/crypto/proof_source_chromium.h
index ee8ecd4..1ed4473 100644
--- a/net/quic/crypto/proof_source_chromium.h
+++ b/net/quic/crypto/proof_source_chromium.h
@@ -23,6 +23,10 @@
class NET_EXPORT_PRIVATE ProofSourceChromium : public quic::ProofSource {
public:
ProofSourceChromium();
+
+ ProofSourceChromium(const ProofSourceChromium&) = delete;
+ ProofSourceChromium& operator=(const ProofSourceChromium&) = delete;
+
~ProofSourceChromium() override;
// Initializes this object based on the certificate chain in |cert_path|,
@@ -76,8 +80,6 @@
quic::QuicReferenceCountedPointer<quic::ProofSource::Chain> chain_;
std::string signed_certificate_timestamp_;
std::unique_ptr<TicketCrypter> ticket_crypter_;
-
- DISALLOW_COPY_AND_ASSIGN(ProofSourceChromium);
};
} // namespace net
diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_verifier_chromium.cc
index d12dcf8..3547d72 100644
--- a/net/quic/crypto/proof_verifier_chromium.cc
+++ b/net/quic/crypto/proof_verifier_chromium.cc
@@ -58,6 +58,10 @@
SCTAuditingDelegate* sct_auditing_delegate,
int cert_verify_flags,
const NetLogWithSource& net_log);
+
+ Job(const Job&) = delete;
+ Job& operator=(const Job&) = delete;
+
~Job();
// Starts the proof verification. If |quic::QUIC_PENDING| is returned, then
@@ -164,8 +168,6 @@
base::TimeTicks start_time_;
NetLogWithSource net_log_;
-
- DISALLOW_COPY_AND_ASSIGN(Job);
};
ProofVerifierChromium::Job::Job(
diff --git a/net/quic/crypto/proof_verifier_chromium.h b/net/quic/crypto/proof_verifier_chromium.h
index 2257541e..02c25594 100644
--- a/net/quic/crypto/proof_verifier_chromium.h
+++ b/net/quic/crypto/proof_verifier_chromium.h
@@ -75,6 +75,10 @@
SCTAuditingDelegate* sct_auditing_delegate,
std::set<std::string> hostnames_to_allow_unknown_roots,
const NetworkIsolationKey& network_isolation_key);
+
+ ProofVerifierChromium(const ProofVerifierChromium&) = delete;
+ ProofVerifierChromium& operator=(const ProofVerifierChromium&) = delete;
+
~ProofVerifierChromium() override;
// quic::ProofVerifier interface
@@ -123,8 +127,6 @@
std::set<std::string> hostnames_to_allow_unknown_roots_;
const NetworkIsolationKey network_isolation_key_;
-
- DISALLOW_COPY_AND_ASSIGN(ProofVerifierChromium);
};
} // namespace net
diff --git a/net/quic/mock_crypto_client_stream.h b/net/quic/mock_crypto_client_stream.h
index 68e5ad9..bce173321 100644
--- a/net/quic/mock_crypto_client_stream.h
+++ b/net/quic/mock_crypto_client_stream.h
@@ -56,6 +56,10 @@
HandshakeMode handshake_mode,
const net::ProofVerifyDetailsChromium* proof_verify_details_,
bool use_mock_crypter);
+
+ MockCryptoClientStream(const MockCryptoClientStream&) = delete;
+ MockCryptoClientStream& operator=(const MockCryptoClientStream&) = delete;
+
~MockCryptoClientStream() override;
// CryptoFramerVisitorInterface implementation.
@@ -105,8 +109,6 @@
const quic::QuicServerId server_id_;
const net::ProofVerifyDetailsChromium* proof_verify_details_;
const quic::QuicConfig config_;
-
- DISALLOW_COPY_AND_ASSIGN(MockCryptoClientStream);
};
} // namespace net
diff --git a/net/quic/mock_crypto_client_stream_factory.h b/net/quic/mock_crypto_client_stream_factory.h
index b0f8193e6..e80a933 100644
--- a/net/quic/mock_crypto_client_stream_factory.h
+++ b/net/quic/mock_crypto_client_stream_factory.h
@@ -22,6 +22,11 @@
class MockCryptoClientStreamFactory : public QuicCryptoClientStreamFactory {
public:
MockCryptoClientStreamFactory();
+
+ MockCryptoClientStreamFactory(const MockCryptoClientStreamFactory&) = delete;
+ MockCryptoClientStreamFactory& operator=(
+ const MockCryptoClientStreamFactory&) = delete;
+
~MockCryptoClientStreamFactory() override;
quic::QuicCryptoClientStream* CreateQuicCryptoClientStream(
@@ -56,8 +61,6 @@
base::queue<const ProofVerifyDetailsChromium*> proof_verify_details_queue_;
std::unique_ptr<quic::QuicConfig> config_;
bool use_mock_crypter_;
-
- DISALLOW_COPY_AND_ASSIGN(MockCryptoClientStreamFactory);
};
} // namespace net
diff --git a/net/quic/mock_decrypter.h b/net/quic/mock_decrypter.h
index 77a9d49..dceb437 100644
--- a/net/quic/mock_decrypter.h
+++ b/net/quic/mock_decrypter.h
@@ -23,6 +23,10 @@
class MockDecrypter : public quic::QuicDecrypter {
public:
explicit MockDecrypter(quic::Perspective perspective);
+
+ MockDecrypter(const MockDecrypter&) = delete;
+ MockDecrypter& operator=(const MockDecrypter&) = delete;
+
~MockDecrypter() override {}
// QuicCrypter implementation
@@ -50,9 +54,6 @@
quic::QuicPacketCount GetIntegrityLimit() const override;
absl::string_view GetKey() const override;
absl::string_view GetNoncePrefix() const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockDecrypter);
};
} // namespace net
diff --git a/net/quic/mock_encrypter.h b/net/quic/mock_encrypter.h
index 4cea586..9f6af7cd 100644
--- a/net/quic/mock_encrypter.h
+++ b/net/quic/mock_encrypter.h
@@ -22,6 +22,10 @@
class MockEncrypter : public quic::QuicEncrypter {
public:
explicit MockEncrypter(quic::Perspective perspective);
+
+ MockEncrypter(const MockEncrypter&) = delete;
+ MockEncrypter& operator=(const MockEncrypter&) = delete;
+
~MockEncrypter() override {}
// QuicEncrypter implementation
@@ -44,9 +48,6 @@
quic::QuicPacketCount GetConfidentialityLimit() const override;
absl::string_view GetKey() const override;
absl::string_view GetNoncePrefix() const override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockEncrypter);
};
} // namespace net
diff --git a/net/quic/network_connection.h b/net/quic/network_connection.h
index b804c20c..f217732 100644
--- a/net/quic/network_connection.h
+++ b/net/quic/network_connection.h
@@ -18,6 +18,10 @@
public NetworkChangeNotifier::ConnectionTypeObserver {
public:
NetworkConnection();
+
+ NetworkConnection(const NetworkConnection&) = delete;
+ NetworkConnection& operator=(const NetworkConnection&) = delete;
+
~NetworkConnection() override;
// Returns the underlying connection type.
@@ -50,8 +54,6 @@
// Cache the connection description string to avoid calling the expensive
// GetWifiPHYLayerProtocol() function.
const char* connection_description_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkConnection);
};
} // namespace net
diff --git a/net/quic/platform/impl/quic_chromium_clock.h b/net/quic/platform/impl/quic_chromium_clock.h
index 29012d49..48582d3 100644
--- a/net/quic/platform/impl/quic_chromium_clock.h
+++ b/net/quic/platform/impl/quic_chromium_clock.h
@@ -19,6 +19,10 @@
static QuicChromiumClock* GetInstance();
QuicChromiumClock();
+
+ QuicChromiumClock(const QuicChromiumClock&) = delete;
+ QuicChromiumClock& operator=(const QuicChromiumClock&) = delete;
+
~QuicChromiumClock() override;
// QuicClock implementation:
@@ -29,9 +33,6 @@
// Converts a QuicTime returned by QuicChromiumClock to base::TimeTicks.
// Helper functions to safely convert between QuicTime and TimeTicks.
static base::TimeTicks QuicTimeToTimeTicks(QuicTime quic_time);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(QuicChromiumClock);
};
} // namespace quic
diff --git a/net/quic/platform/impl/quic_epoll_clock.h b/net/quic/platform/impl/quic_epoll_clock.h
index 7bcf2b91..19361900 100644
--- a/net/quic/platform/impl/quic_epoll_clock.h
+++ b/net/quic/platform/impl/quic_epoll_clock.h
@@ -23,6 +23,10 @@
class QuicEpollClock : public QuicClock {
public:
explicit QuicEpollClock(epoll_server::SimpleEpollServer* epoll_server);
+
+ QuicEpollClock(const QuicEpollClock&) = delete;
+ QuicEpollClock& operator=(const QuicEpollClock&) = delete;
+
~QuicEpollClock() override;
// Returns the approximate current time as a QuicTime object.
@@ -45,9 +49,6 @@
epoll_server::SimpleEpollServer* epoll_server_;
// Largest time returned from Now() so far.
mutable QuicTime largest_time_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(QuicEpollClock);
};
} // namespace quic
diff --git a/net/quic/properties_based_quic_server_info.h b/net/quic/properties_based_quic_server_info.h
index 945f45b5..b04c18e 100644
--- a/net/quic/properties_based_quic_server_info.h
+++ b/net/quic/properties_based_quic_server_info.h
@@ -25,6 +25,11 @@
const quic::QuicServerId& server_id,
const NetworkIsolationKey& network_isolation_key,
HttpServerProperties* http_server_properties);
+
+ PropertiesBasedQuicServerInfo(const PropertiesBasedQuicServerInfo&) = delete;
+ PropertiesBasedQuicServerInfo& operator=(
+ const PropertiesBasedQuicServerInfo&) = delete;
+
~PropertiesBasedQuicServerInfo() override;
// QuicServerInfo implementation.
@@ -34,8 +39,6 @@
private:
const NetworkIsolationKey network_isolation_key_;
HttpServerProperties* const http_server_properties_;
-
- DISALLOW_COPY_AND_ASSIGN(PropertiesBasedQuicServerInfo);
};
} // namespace net
diff --git a/net/quic/quic_chromium_alarm_factory.h b/net/quic/quic_chromium_alarm_factory.h
index 6082aff..2df53db8 100644
--- a/net/quic/quic_chromium_alarm_factory.h
+++ b/net/quic/quic_chromium_alarm_factory.h
@@ -26,6 +26,10 @@
public:
QuicChromiumAlarmFactory(base::SequencedTaskRunner* task_runner,
const quic::QuicClock* clock);
+
+ QuicChromiumAlarmFactory(const QuicChromiumAlarmFactory&) = delete;
+ QuicChromiumAlarmFactory& operator=(const QuicChromiumAlarmFactory&) = delete;
+
~QuicChromiumAlarmFactory() override;
// quic::QuicAlarmFactory
@@ -37,8 +41,6 @@
private:
base::SequencedTaskRunner* task_runner_;
const quic::QuicClock* const clock_;
-
- DISALLOW_COPY_AND_ASSIGN(QuicChromiumAlarmFactory);
};
} // namespace net
diff --git a/net/quic/quic_chromium_client_session.h b/net/quic/quic_chromium_client_session.h
index d4299a5e..c73f8d3a 100644
--- a/net/quic/quic_chromium_client_session.h
+++ b/net/quic/quic_chromium_client_session.h
@@ -355,6 +355,9 @@
// A helper class used to manage a request to create a stream.
class NET_EXPORT_PRIVATE StreamRequest {
public:
+ StreamRequest(const StreamRequest&) = delete;
+ StreamRequest& operator=(const StreamRequest&) = delete;
+
// Cancels any pending stream creation request and resets |stream_| if
// it has not yet been released.
~StreamRequest();
@@ -418,8 +421,6 @@
const NetworkTrafficAnnotationTag traffic_annotation_;
base::WeakPtrFactory<StreamRequest> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(StreamRequest);
};
// This class contains all the context needed for path validation and
@@ -496,6 +497,12 @@
QuicChromiumPathValidationWriterDelegate(
QuicChromiumClientSession* session,
base::SequencedTaskRunner* task_runner);
+
+ QuicChromiumPathValidationWriterDelegate(
+ const QuicChromiumPathValidationWriterDelegate&) = delete;
+ QuicChromiumPathValidationWriterDelegate& operator=(
+ const QuicChromiumPathValidationWriterDelegate&) = delete;
+
~QuicChromiumPathValidationWriterDelegate();
// QuicChromiumPacketWriter::Delegate interface.
@@ -521,7 +528,6 @@
quic::QuicSocketAddress peer_address_;
base::WeakPtrFactory<QuicChromiumPathValidationWriterDelegate>
weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(QuicChromiumPathValidationWriterDelegate);
};
// Constructs a new session which will own |connection|, but not
diff --git a/net/quic/quic_chromium_client_stream.h b/net/quic/quic_chromium_client_stream.h
index 3e7fa3b..06ad95b7 100644
--- a/net/quic/quic_chromium_client_stream.h
+++ b/net/quic/quic_chromium_client_stream.h
@@ -42,6 +42,9 @@
// Wrapper for interacting with the session in a restricted fashion.
class NET_EXPORT_PRIVATE Handle {
public:
+ Handle(const Handle&) = delete;
+ Handle& operator=(const Handle&) = delete;
+
~Handle();
// Returns true if the stream is still connected.
@@ -211,8 +214,6 @@
base::TimeTicks first_early_hints_time_;
base::WeakPtrFactory<Handle> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Handle);
};
QuicChromiumClientStream(
diff --git a/net/quic/quic_chromium_client_stream_test.cc b/net/quic/quic_chromium_client_stream_test.cc
index dd035c0..4d5cc610 100644
--- a/net/quic/quic_chromium_client_stream_test.cc
+++ b/net/quic/quic_chromium_client_stream_test.cc
@@ -42,6 +42,11 @@
public:
explicit MockQuicClientSessionBase(quic::QuicConnection* connection,
quic::QuicClientPushPromiseIndex* index);
+
+ MockQuicClientSessionBase(const MockQuicClientSessionBase&) = delete;
+ MockQuicClientSessionBase& operator=(const MockQuicClientSessionBase&) =
+ delete;
+
~MockQuicClientSessionBase() override;
const quic::QuicCryptoStream* GetCryptoStream() const override {
@@ -138,8 +143,6 @@
private:
std::unique_ptr<quic::QuicCryptoStream> crypto_stream_;
-
- DISALLOW_COPY_AND_ASSIGN(MockQuicClientSessionBase);
};
MockQuicClientSessionBase::MockQuicClientSessionBase(
diff --git a/net/quic/quic_chromium_connection_helper.h b/net/quic/quic_chromium_connection_helper.h
index e3b4460..6285fde 100644
--- a/net/quic/quic_chromium_connection_helper.h
+++ b/net/quic/quic_chromium_connection_helper.h
@@ -29,6 +29,11 @@
public:
QuicChromiumConnectionHelper(const quic::QuicClock* clock,
quic::QuicRandom* random_generator);
+
+ QuicChromiumConnectionHelper(const QuicChromiumConnectionHelper&) = delete;
+ QuicChromiumConnectionHelper& operator=(const QuicChromiumConnectionHelper&) =
+ delete;
+
~QuicChromiumConnectionHelper() override;
// quic::QuicConnectionHelperInterface
@@ -39,8 +44,6 @@
private:
const quic::QuicClock* clock_;
quic::QuicRandom* random_generator_;
-
- DISALLOW_COPY_AND_ASSIGN(QuicChromiumConnectionHelper);
};
} // namespace net
diff --git a/net/quic/quic_chromium_packet_reader.h b/net/quic/quic_chromium_packet_reader.h
index ca3d587..faf420e3 100644
--- a/net/quic/quic_chromium_packet_reader.h
+++ b/net/quic/quic_chromium_packet_reader.h
@@ -46,6 +46,10 @@
int yield_after_packets,
quic::QuicTime::Delta yield_after_duration,
const NetLogWithSource& net_log);
+
+ QuicChromiumPacketReader(const QuicChromiumPacketReader&) = delete;
+ QuicChromiumPacketReader& operator=(const QuicChromiumPacketReader&) = delete;
+
virtual ~QuicChromiumPacketReader();
// Causes the QuicConnectionHelper to start reading from the socket
@@ -71,8 +75,6 @@
NetLogWithSource net_log_;
base::WeakPtrFactory<QuicChromiumPacketReader> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(QuicChromiumPacketReader);
};
} // namespace net
diff --git a/net/quic/quic_chromium_packet_writer.h b/net/quic/quic_chromium_packet_writer.h
index 2f03d39..b67a5b3 100644
--- a/net/quic/quic_chromium_packet_writer.h
+++ b/net/quic/quic_chromium_packet_writer.h
@@ -69,6 +69,10 @@
// |socket| and |task_runner| must outlive writer.
QuicChromiumPacketWriter(DatagramClientSocket* socket,
base::SequencedTaskRunner* task_runner);
+
+ QuicChromiumPacketWriter(const QuicChromiumPacketWriter&) = delete;
+ QuicChromiumPacketWriter& operator=(const QuicChromiumPacketWriter&) = delete;
+
~QuicChromiumPacketWriter() override;
// |delegate| must outlive writer.
@@ -127,8 +131,6 @@
CompletionRepeatingCallback write_callback_;
base::WeakPtrFactory<QuicChromiumPacketWriter> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(QuicChromiumPacketWriter);
};
} // namespace net
diff --git a/net/quic/quic_connection_logger.h b/net/quic/quic_connection_logger.h
index 6e41cb2..837e1d78 100644
--- a/net/quic/quic_connection_logger.h
+++ b/net/quic/quic_connection_logger.h
@@ -39,6 +39,9 @@
std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher,
const NetLogWithSource& net_log);
+ QuicConnectionLogger(const QuicConnectionLogger&) = delete;
+ QuicConnectionLogger& operator=(const QuicConnectionLogger&) = delete;
+
~QuicConnectionLogger() override;
// quic::QuicPacketCreator::DebugDelegateInterface
@@ -210,8 +213,6 @@
const std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher_;
QuicEventLogger event_logger_;
-
- DISALLOW_COPY_AND_ASSIGN(QuicConnectionLogger);
};
} // namespace net
diff --git a/net/quic/quic_connectivity_monitor.h b/net/quic/quic_connectivity_monitor.h
index 4d0aabc..5be9fd5d 100644
--- a/net/quic/quic_connectivity_monitor.h
+++ b/net/quic/quic_connectivity_monitor.h
@@ -25,6 +25,9 @@
explicit QuicConnectivityMonitor(
NetworkChangeNotifier::NetworkHandle default_network);
+ QuicConnectivityMonitor(const QuicConnectivityMonitor&) = delete;
+ QuicConnectivityMonitor& operator=(const QuicConnectivityMonitor&) = delete;
+
~QuicConnectivityMonitor() override;
// Records connectivity related stats to histograms.
@@ -119,7 +122,6 @@
QuicErrorCodeMap quic_error_map_;
base::WeakPtrFactory<QuicConnectivityMonitor> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(QuicConnectivityMonitor);
};
} // namespace net
diff --git a/net/quic/quic_connectivity_probing_manager.h b/net/quic/quic_connectivity_probing_manager.h
index d7e0a9c..8b86522 100644
--- a/net/quic/quic_connectivity_probing_manager.h
+++ b/net/quic/quic_connectivity_probing_manager.h
@@ -52,6 +52,12 @@
QuicConnectivityProbingManager(Delegate* delegate,
base::SequencedTaskRunner* task_runner);
+
+ QuicConnectivityProbingManager(const QuicConnectivityProbingManager&) =
+ delete;
+ QuicConnectivityProbingManager& operator=(
+ const QuicConnectivityProbingManager&) = delete;
+
~QuicConnectivityProbingManager();
// QuicChromiumPacketWriter::Delegate interface.
@@ -143,7 +149,6 @@
bool stateless_reset_received_;
base::WeakPtrFactory<QuicConnectivityProbingManager> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(QuicConnectivityProbingManager);
};
} // namespace net
diff --git a/net/quic/quic_connectivity_probing_manager_test.cc b/net/quic/quic_connectivity_probing_manager_test.cc
index 307fef0..ae75d9d 100644
--- a/net/quic/quic_connectivity_probing_manager_test.cc
+++ b/net/quic/quic_connectivity_probing_manager_test.cc
@@ -43,6 +43,11 @@
MockQuicChromiumClientSession()
: probed_network_(NetworkChangeNotifier::kInvalidNetworkHandle),
is_successfully_probed_(false) {}
+
+ MockQuicChromiumClientSession(const MockQuicChromiumClientSession&) = delete;
+ MockQuicChromiumClientSession& operator=(
+ const MockQuicChromiumClientSession&) = delete;
+
~MockQuicChromiumClientSession() override {}
// QuicChromiumPacketReader::Visitor interface.
@@ -100,8 +105,6 @@
quic::QuicSocketAddress probed_peer_address_;
quic::QuicSocketAddress probed_self_address_;
bool is_successfully_probed_;
-
- DISALLOW_COPY_AND_ASSIGN(MockQuicChromiumClientSession);
};
class QuicConnectivityProbingManagerTest : public ::testing::Test {
diff --git a/net/quic/quic_http3_logger.h b/net/quic/quic_http3_logger.h
index c22fc79f..aee0f1be 100644
--- a/net/quic/quic_http3_logger.h
+++ b/net/quic/quic_http3_logger.h
@@ -20,6 +20,9 @@
public:
explicit QuicHttp3Logger(const NetLogWithSource& net_log);
+ QuicHttp3Logger(const QuicHttp3Logger&) = delete;
+ QuicHttp3Logger& operator=(const QuicHttp3Logger&) = delete;
+
~QuicHttp3Logger() override;
// Implementation of Http3DebugVisitor.
@@ -62,8 +65,6 @@
private:
NetLogWithSource net_log_;
-
- DISALLOW_COPY_AND_ASSIGN(QuicHttp3Logger);
};
} // namespace net
diff --git a/net/quic/quic_http_stream.h b/net/quic/quic_http_stream.h
index 3854386..84ce10c 100644
--- a/net/quic/quic_http_stream.h
+++ b/net/quic/quic_http_stream.h
@@ -45,6 +45,9 @@
std::unique_ptr<QuicChromiumClientSession::Handle> session,
std::vector<std::string> dns_aliases);
+ QuicHttpStream(const QuicHttpStream&) = delete;
+ QuicHttpStream& operator=(const QuicHttpStream&) = delete;
+
~QuicHttpStream() override;
// HttpStream implementation.
@@ -232,8 +235,6 @@
std::vector<std::string> dns_aliases_;
base::WeakPtrFactory<QuicHttpStream> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(QuicHttpStream);
};
} // namespace net
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index 5bbcfc1..3b8d346f 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -188,6 +188,11 @@
explicit ReadErrorUploadDataStream(FailureMode mode)
: UploadDataStream(true, 0), async_(mode) {}
+
+ ReadErrorUploadDataStream(const ReadErrorUploadDataStream&) = delete;
+ ReadErrorUploadDataStream& operator=(const ReadErrorUploadDataStream&) =
+ delete;
+
~ReadErrorUploadDataStream() override {}
private:
@@ -211,8 +216,6 @@
const FailureMode async_;
base::WeakPtrFactory<ReadErrorUploadDataStream> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ReadErrorUploadDataStream);
};
// A helper class that will delete |stream| when the callback is invoked.
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index 6af20335..17054f1e 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -229,6 +229,11 @@
bool* rtt_notification_received)
: should_notify_updated_rtt_(should_notify_updated_rtt),
rtt_notification_received_(rtt_notification_received) {}
+
+ TestSocketPerformanceWatcher(const TestSocketPerformanceWatcher&) = delete;
+ TestSocketPerformanceWatcher& operator=(const TestSocketPerformanceWatcher&) =
+ delete;
+
~TestSocketPerformanceWatcher() override {}
bool ShouldNotifyUpdatedRTT() const override {
@@ -244,8 +249,6 @@
private:
bool* should_notify_updated_rtt_;
bool* rtt_notification_received_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSocketPerformanceWatcher);
};
class TestSocketPerformanceWatcherFactory
@@ -255,6 +258,12 @@
: watcher_count_(0u),
should_notify_updated_rtt_(true),
rtt_notification_received_(false) {}
+
+ TestSocketPerformanceWatcherFactory(
+ const TestSocketPerformanceWatcherFactory&) = delete;
+ TestSocketPerformanceWatcherFactory& operator=(
+ const TestSocketPerformanceWatcherFactory&) = delete;
+
~TestSocketPerformanceWatcherFactory() override {}
// SocketPerformanceWatcherFactory implementation:
@@ -282,8 +291,6 @@
size_t watcher_count_;
bool should_notify_updated_rtt_;
bool rtt_notification_received_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSocketPerformanceWatcherFactory);
};
class QuicNetworkTransactionTest
diff --git a/net/quic/quic_proxy_client_socket.h b/net/quic/quic_proxy_client_socket.h
index 070ef37..00700d9 100644
--- a/net/quic/quic_proxy_client_socket.h
+++ b/net/quic/quic_proxy_client_socket.h
@@ -40,6 +40,9 @@
HttpAuthController* auth_controller,
ProxyDelegate* proxy_delegate);
+ QuicProxyClientSocket(const QuicProxyClientSocket&) = delete;
+ QuicProxyClientSocket& operator=(const QuicProxyClientSocket&) = delete;
+
// On destruction Disconnect() is called.
~QuicProxyClientSocket() override;
@@ -149,8 +152,6 @@
// The default weak pointer factory.
base::WeakPtrFactory<QuicProxyClientSocket> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(QuicProxyClientSocket);
};
} // namespace net
diff --git a/net/quic/quic_proxy_client_socket_unittest.cc b/net/quic/quic_proxy_client_socket_unittest.cc
index b232fff..2a03f72 100644
--- a/net/quic/quic_proxy_client_socket_unittest.cc
+++ b/net/quic/quic_proxy_client_socket_unittest.cc
@@ -1991,6 +1991,9 @@
explicit DeleteSockCallback(std::unique_ptr<QuicProxyClientSocket>* sock)
: sock_(sock) {}
+ DeleteSockCallback(const DeleteSockCallback&) = delete;
+ DeleteSockCallback& operator=(const DeleteSockCallback&) = delete;
+
~DeleteSockCallback() override {}
CompletionOnceCallback callback() {
@@ -2005,8 +2008,6 @@
}
std::unique_ptr<QuicProxyClientSocket>* sock_;
-
- DISALLOW_COPY_AND_ASSIGN(DeleteSockCallback);
};
// If the socket is reset when both a read and write are pending, and the
diff --git a/net/quic/quic_server_info.h b/net/quic/quic_server_info.h
index 2100fd0..c068f4bd 100644
--- a/net/quic/quic_server_info.h
+++ b/net/quic/quic_server_info.h
@@ -41,6 +41,10 @@
};
explicit QuicServerInfo(const quic::QuicServerId& server_id);
+
+ QuicServerInfo(const QuicServerInfo&) = delete;
+ QuicServerInfo& operator=(const QuicServerInfo&) = delete;
+
virtual ~QuicServerInfo();
// Fetches the server config from the backing store, and returns true
@@ -52,6 +56,10 @@
struct State {
State();
+
+ State(const State&) = delete;
+ State& operator=(const State&) = delete;
+
~State();
void Clear();
@@ -64,9 +72,6 @@
std::vector<std::string> certs; // A list of certificates in leaf-first
// order.
std::string server_config_sig; // A signature of |server_config_|.
-
- private:
- DISALLOW_COPY_AND_ASSIGN(State);
};
// Once the data is ready, it can be read using the following members. These
@@ -93,8 +98,6 @@
// SerializeInner is a helper function for Serialize.
std::string SerializeInner() const;
-
- DISALLOW_COPY_AND_ASSIGN(QuicServerInfo);
};
} // namespace net
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index d138043..ffc0514 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -239,6 +239,10 @@
DCHECK(quic_stream_factory_);
}
+ QuicCryptoClientConfigOwner(const QuicCryptoClientConfigOwner&) = delete;
+ QuicCryptoClientConfigOwner& operator=(const QuicCryptoClientConfigOwner&) =
+ delete;
+
~QuicCryptoClientConfigOwner() { DCHECK_EQ(num_refs_, 0); }
quic::QuicCryptoClientConfig* config() { return &config_; }
@@ -265,8 +269,6 @@
int num_refs_ = 0;
quic::QuicCryptoClientConfig config_;
QuicStreamFactory* const quic_stream_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientConfigOwner);
};
// Class that owns a reference to a QuicCryptoClientConfigOwner. Handles
@@ -323,6 +325,9 @@
int cert_verify_flags,
const NetLogWithSource& net_log);
+ Job(const Job&) = delete;
+ Job& operator=(const Job&) = delete;
+
~Job();
int Run(CompletionOnceCallback callback);
@@ -478,8 +483,6 @@
base::TimeTicks quic_connection_start_time_;
std::set<QuicStreamRequest*> stream_requests_;
base::WeakPtrFactory<Job> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(Job);
};
QuicStreamFactory::Job::Job(
diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h
index 60ce305..bb4206a0 100644
--- a/net/quic/quic_stream_factory.h
+++ b/net/quic/quic_stream_factory.h
@@ -110,6 +110,10 @@
class NET_EXPORT_PRIVATE QuicStreamRequest {
public:
explicit QuicStreamRequest(QuicStreamFactory* factory);
+
+ QuicStreamRequest(const QuicStreamRequest&) = delete;
+ QuicStreamRequest& operator=(const QuicStreamRequest&) = delete;
+
~QuicStreamRequest();
// |cert_verify_flags| is bitwise OR'd of CertVerifier::VerifyFlags and it is
@@ -193,8 +197,6 @@
bool expect_on_host_resolution_;
// Callback passed to WaitForHostResolution().
CompletionOnceCallback host_resolution_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(QuicStreamRequest);
};
// A factory for fetching QuicChromiumClientSessions.
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index 9ae30f1..28a99e4 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -149,6 +149,12 @@
class TestConnectionMigrationSocketFactory : public MockClientSocketFactory {
public:
TestConnectionMigrationSocketFactory() : next_source_host_num_(1u) {}
+
+ TestConnectionMigrationSocketFactory(
+ const TestConnectionMigrationSocketFactory&) = delete;
+ TestConnectionMigrationSocketFactory& operator=(
+ const TestConnectionMigrationSocketFactory&) = delete;
+
~TestConnectionMigrationSocketFactory() override = default;
std::unique_ptr<DatagramClientSocket> CreateDatagramClientSocket(
@@ -164,8 +170,6 @@
private:
uint8_t next_source_host_num_;
-
- DISALLOW_COPY_AND_ASSIGN(TestConnectionMigrationSocketFactory);
};
// TestPortMigrationSocketFactory will vend sockets with incremental port
@@ -173,6 +177,12 @@
class TestPortMigrationSocketFactory : public MockClientSocketFactory {
public:
TestPortMigrationSocketFactory() : next_source_port_num_(1u) {}
+
+ TestPortMigrationSocketFactory(const TestPortMigrationSocketFactory&) =
+ delete;
+ TestPortMigrationSocketFactory& operator=(
+ const TestPortMigrationSocketFactory&) = delete;
+
~TestPortMigrationSocketFactory() override = default;
std::unique_ptr<DatagramClientSocket> CreateDatagramClientSocket(
@@ -188,8 +198,6 @@
private:
uint16_t next_source_port_num_;
-
- DISALLOW_COPY_AND_ASSIGN(TestPortMigrationSocketFactory);
};
class QuicStreamFactoryTestBase : public WithTaskEnvironment {
diff --git a/net/quic/quic_test_packet_maker.h b/net/quic/quic_test_packet_maker.h
index b020d02..9e89255 100644
--- a/net/quic/quic_test_packet_maker.h
+++ b/net/quic/quic_test_packet_maker.h
@@ -52,6 +52,10 @@
const std::string& host,
quic::Perspective perspective,
bool client_headers_include_h2_stream_dependency);
+
+ QuicTestPacketMaker(const QuicTestPacketMaker&) = delete;
+ QuicTestPacketMaker& operator=(const QuicTestPacketMaker&) = delete;
+
~QuicTestPacketMaker();
void set_hostname(const std::string& host);
@@ -617,8 +621,6 @@
quic::QuicPacketHeader header_;
quic::QuicFrames frames_;
std::unique_ptr<quic::test::SimpleDataProducer> data_producer_;
-
- DISALLOW_COPY_AND_ASSIGN(QuicTestPacketMaker);
};
} // namespace test
diff --git a/net/reporting/mock_persistent_reporting_store.h b/net/reporting/mock_persistent_reporting_store.h
index b53e397..85c53f4e9 100644
--- a/net/reporting/mock_persistent_reporting_store.h
+++ b/net/reporting/mock_persistent_reporting_store.h
@@ -81,6 +81,11 @@
using CommandList = std::vector<Command>;
MockPersistentReportingStore();
+
+ MockPersistentReportingStore(const MockPersistentReportingStore&) = delete;
+ MockPersistentReportingStore& operator=(const MockPersistentReportingStore&) =
+ delete;
+
~MockPersistentReportingStore() override;
// PersistentReportingStore implementation:
@@ -150,8 +155,6 @@
// called. Reset to 0 when Flush() is called.
int queued_endpoint_count_delta_;
int queued_endpoint_group_count_delta_;
-
- DISALLOW_COPY_AND_ASSIGN(MockPersistentReportingStore);
};
bool operator==(const MockPersistentReportingStore::Command& lhs,
diff --git a/net/reporting/reporting_cache.h b/net/reporting/reporting_cache.h
index 6a44455..39b4421 100644
--- a/net/reporting/reporting_cache.h
+++ b/net/reporting/reporting_cache.h
@@ -321,6 +321,10 @@
std::vector<CachedReportingEndpointGroup>)>;
PersistentReportingStore() = default;
+
+ PersistentReportingStore(const PersistentReportingStore&) = delete;
+ PersistentReportingStore& operator=(const PersistentReportingStore&) = delete;
+
virtual ~PersistentReportingStore() = default;
// Initializes the store and retrieves stored endpoints and endpoint groups.
@@ -355,9 +359,6 @@
// Flushes the store.
virtual void Flush() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PersistentReportingStore);
};
} // namespace net
diff --git a/net/reporting/reporting_cache_impl.h b/net/reporting/reporting_cache_impl.h
index 627a0e1f..ee886b9 100644
--- a/net/reporting/reporting_cache_impl.h
+++ b/net/reporting/reporting_cache_impl.h
@@ -35,6 +35,9 @@
public:
ReportingCacheImpl(ReportingContext* context);
+ ReportingCacheImpl(const ReportingCacheImpl&) = delete;
+ ReportingCacheImpl& operator=(const ReportingCacheImpl&) = delete;
+
~ReportingCacheImpl() override;
// ReportingCache implementation
@@ -379,8 +382,6 @@
base::flat_set<base::UnguessableToken> expired_sources_;
SEQUENCE_CHECKER(sequence_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ReportingCacheImpl);
};
} // namespace net
diff --git a/net/reporting/reporting_context.h b/net/reporting/reporting_context.h
index 6732664..6e5ba24 100644
--- a/net/reporting/reporting_context.h
+++ b/net/reporting/reporting_context.h
@@ -39,6 +39,9 @@
URLRequestContext* request_context,
ReportingCache::PersistentReportingStore* store);
+ ReportingContext(const ReportingContext&) = delete;
+ ReportingContext& operator=(const ReportingContext&) = delete;
+
~ReportingContext();
const ReportingPolicy& policy() const { return policy_; }
@@ -104,8 +107,6 @@
// |network_change_observer_| must come after |cache_|.
std::unique_ptr<ReportingNetworkChangeObserver> network_change_observer_;
-
- DISALLOW_COPY_AND_ASSIGN(ReportingContext);
};
} // namespace net
diff --git a/net/reporting/reporting_delivery_agent.cc b/net/reporting/reporting_delivery_agent.cc
index b9731ab..4161ab9 100644
--- a/net/reporting/reporting_delivery_agent.cc
+++ b/net/reporting/reporting_delivery_agent.cc
@@ -192,6 +192,10 @@
context_->AddCacheObserver(this);
}
+ ReportingDeliveryAgentImpl(const ReportingDeliveryAgentImpl&) = delete;
+ ReportingDeliveryAgentImpl& operator=(const ReportingDeliveryAgentImpl&) =
+ delete;
+
// ReportingDeliveryAgent implementation:
~ReportingDeliveryAgentImpl() override {
@@ -380,8 +384,6 @@
std::unique_ptr<ReportingEndpointManager> endpoint_manager_;
base::WeakPtrFactory<ReportingDeliveryAgentImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ReportingDeliveryAgentImpl);
};
} // namespace
diff --git a/net/reporting/reporting_endpoint_manager.cc b/net/reporting/reporting_endpoint_manager.cc
index 645ab993..b55c20c 100644
--- a/net/reporting/reporting_endpoint_manager.cc
+++ b/net/reporting/reporting_endpoint_manager.cc
@@ -49,6 +49,10 @@
DCHECK(cache);
}
+ ReportingEndpointManagerImpl(const ReportingEndpointManagerImpl&) = delete;
+ ReportingEndpointManagerImpl& operator=(const ReportingEndpointManagerImpl&) =
+ delete;
+
~ReportingEndpointManagerImpl() override = default;
const ReportingEndpoint FindEndpointForDelivery(
@@ -153,8 +157,6 @@
// growth of this map.
base::MRUCache<EndpointBackoffKey, std::unique_ptr<net::BackoffEntry>>
endpoint_backoff_;
-
- DISALLOW_COPY_AND_ASSIGN(ReportingEndpointManagerImpl);
};
} // namespace
diff --git a/net/reporting/reporting_endpoint_manager_unittest.cc b/net/reporting/reporting_endpoint_manager_unittest.cc
index 1f2da2d..6a1d27f 100644
--- a/net/reporting/reporting_endpoint_manager_unittest.cc
+++ b/net/reporting/reporting_endpoint_manager_unittest.cc
@@ -33,6 +33,10 @@
TestReportingCache(const url::Origin& expected_origin,
const std::string& expected_group)
: expected_origin_(expected_origin), expected_group_(expected_group) {}
+
+ TestReportingCache(const TestReportingCache&) = delete;
+ TestReportingCache& operator=(const TestReportingCache&) = delete;
+
~TestReportingCache() override = default;
void SetEndpoint(const ReportingEndpoint& reporting_endpoint) {
@@ -231,8 +235,6 @@
std::map<NetworkIsolationKey, std::vector<ReportingEndpoint>>
reporting_endpoints_;
base::flat_set<base::UnguessableToken> expired_sources_;
-
- DISALLOW_COPY_AND_ASSIGN(TestReportingCache);
};
class ReportingEndpointManagerTest : public testing::Test {
diff --git a/net/reporting/reporting_network_change_observer.cc b/net/reporting/reporting_network_change_observer.cc
index 4e1d20e..5fc0cfe 100644
--- a/net/reporting/reporting_network_change_observer.cc
+++ b/net/reporting/reporting_network_change_observer.cc
@@ -24,6 +24,11 @@
NetworkChangeNotifier::AddNetworkChangeObserver(this);
}
+ ReportingNetworkChangeObserverImpl(
+ const ReportingNetworkChangeObserverImpl&) = delete;
+ ReportingNetworkChangeObserverImpl& operator=(
+ const ReportingNetworkChangeObserverImpl&) = delete;
+
// ReportingNetworkChangeObserver implementation:
~ReportingNetworkChangeObserverImpl() override {
NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
@@ -47,8 +52,6 @@
private:
ReportingContext* context_;
-
- DISALLOW_COPY_AND_ASSIGN(ReportingNetworkChangeObserverImpl);
};
} // namespace
diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc
index 3e6fde53..58dea43 100644
--- a/net/reporting/reporting_service.cc
+++ b/net/reporting/reporting_service.cc
@@ -49,6 +49,9 @@
initialized_ = true;
}
+ ReportingServiceImpl(const ReportingServiceImpl&) = delete;
+ ReportingServiceImpl& operator=(const ReportingServiceImpl&) = delete;
+
// ReportingService implementation:
~ReportingServiceImpl() override {
@@ -303,8 +306,6 @@
NetworkIsolationKey empty_nik_;
base::WeakPtrFactory<ReportingServiceImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ReportingServiceImpl);
};
} // namespace
diff --git a/net/reporting/reporting_service.h b/net/reporting/reporting_service.h
index 94ac0158..8643e16 100644
--- a/net/reporting/reporting_service.h
+++ b/net/reporting/reporting_service.h
@@ -34,6 +34,9 @@
// and also other parts of //net.
class NET_EXPORT ReportingService {
public:
+ ReportingService(const ReportingService&) = delete;
+ ReportingService& operator=(const ReportingService&) = delete;
+
virtual ~ReportingService();
// Creates a ReportingService. |policy| will be copied. |request_context| must
@@ -131,9 +134,6 @@
protected:
ReportingService() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ReportingService);
};
} // namespace net
diff --git a/net/reporting/reporting_test_util.h b/net/reporting/reporting_test_util.h
index 0efcbf6..2554020 100644
--- a/net/reporting/reporting_test_util.h
+++ b/net/reporting/reporting_test_util.h
@@ -107,6 +107,9 @@
public:
TestReportingDelegate();
+ TestReportingDelegate(const TestReportingDelegate&) = delete;
+ TestReportingDelegate& operator=(const TestReportingDelegate&) = delete;
+
// ReportingDelegate implementation:
~TestReportingDelegate() override;
@@ -141,8 +144,6 @@
mutable std::set<url::Origin> saved_origins_;
mutable base::OnceCallback<void(std::set<url::Origin>)>
permissions_check_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TestReportingDelegate);
};
// A test implementation of ReportingContext that uses test versions of
@@ -154,6 +155,10 @@
const base::TickClock* tick_clock,
const ReportingPolicy& policy,
ReportingCache::PersistentReportingStore* store = nullptr);
+
+ TestReportingContext(const TestReportingContext&) = delete;
+ TestReportingContext& operator=(const TestReportingContext&) = delete;
+
~TestReportingContext();
base::MockOneShotTimer* test_delivery_timer() { return delivery_timer_; }
@@ -173,8 +178,6 @@
base::MockOneShotTimer* delivery_timer_;
base::MockOneShotTimer* garbage_collection_timer_;
-
- DISALLOW_COPY_AND_ASSIGN(TestReportingContext);
};
// A unit test base class that provides a TestReportingContext and shorthand
diff --git a/net/server/http_server.h b/net/server/http_server.h
index cb70b57..f8664223 100644
--- a/net/server/http_server.h
+++ b/net/server/http_server.h
@@ -50,6 +50,10 @@
// callbacks yet.
HttpServer(std::unique_ptr<ServerSocket> server_socket,
HttpServer::Delegate* delegate);
+
+ HttpServer(const HttpServer&) = delete;
+ HttpServer& operator=(const HttpServer&) = delete;
+
~HttpServer();
void AcceptWebSocket(int connection_id,
@@ -132,8 +136,6 @@
std::map<int, std::unique_ptr<HttpConnection>> id_to_connection_;
base::WeakPtrFactory<HttpServer> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(HttpServer);
};
} // namespace net
diff --git a/net/server/web_socket.h b/net/server/web_socket.h
index 3d72f9e..d5c91e0 100644
--- a/net/server/web_socket.h
+++ b/net/server/web_socket.h
@@ -42,6 +42,10 @@
void Send(base::StringPiece message,
WebSocketFrameHeader::OpCodeEnum op_code,
const NetworkTrafficAnnotationTag traffic_annotation);
+
+ WebSocket(const WebSocket&) = delete;
+ WebSocket& operator=(const WebSocket&) = delete;
+
~WebSocket();
private:
@@ -54,8 +58,6 @@
std::unique_ptr<WebSocketEncoder> encoder_;
bool closed_;
std::unique_ptr<NetworkTrafficAnnotationTag> traffic_annotation_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocket);
};
} // namespace net
diff --git a/net/server/web_socket_encoder.h b/net/server/web_socket_encoder.h
index b1e76242..3f18f000 100644
--- a/net/server/web_socket_encoder.h
+++ b/net/server/web_socket_encoder.h
@@ -23,6 +23,9 @@
public:
static const char kClientExtensions[];
+ WebSocketEncoder(const WebSocketEncoder&) = delete;
+ WebSocketEncoder& operator=(const WebSocketEncoder&) = delete;
+
~WebSocketEncoder();
// Creates and returns an encoder for a server without extensions.
@@ -67,8 +70,6 @@
Type type_;
std::unique_ptr<WebSocketDeflater> deflater_;
std::unique_ptr<WebSocketInflater> inflater_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketEncoder);
};
} // namespace net
diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h
index 49846e4c..61ab4a8 100644
--- a/net/socket/client_socket_handle.h
+++ b/net/socket/client_socket_handle.h
@@ -50,6 +50,10 @@
};
ClientSocketHandle();
+
+ ClientSocketHandle(const ClientSocketHandle&) = delete;
+ ClientSocketHandle& operator=(const ClientSocketHandle&) = delete;
+
~ClientSocketHandle();
// Initializes a ClientSocketHandle object, which involves talking to the
@@ -245,8 +249,6 @@
// Timing information is set when a connection is successfully established.
LoadTimingInfo::ConnectTiming connect_timing_;
-
- DISALLOW_COPY_AND_ASSIGN(ClientSocketHandle);
};
} // namespace net
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index d8fea66..4201c684 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -546,6 +546,9 @@
explicit TestConnectJobFactory(MockClientSocketFactory* client_socket_factory)
: client_socket_factory_(client_socket_factory) {}
+ TestConnectJobFactory(const TestConnectJobFactory&) = delete;
+ TestConnectJobFactory& operator=(const TestConnectJobFactory&) = delete;
+
~TestConnectJobFactory() override = default;
void set_job_type(TestConnectJob::JobType job_type) { job_type_ = job_type; }
@@ -592,8 +595,6 @@
std::list<TestConnectJob::JobType>* job_types_ = nullptr;
base::TimeDelta timeout_duration_;
MockClientSocketFactory* const client_socket_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(TestConnectJobFactory);
};
} // namespace
@@ -3022,6 +3023,9 @@
TransportClientSocketPool* pool)
: group_id_(group_id), params_(params), pool_(pool) {}
+ ConnectWithinCallback(const ConnectWithinCallback&) = delete;
+ ConnectWithinCallback& operator=(const ConnectWithinCallback&) = delete;
+
~ConnectWithinCallback() override = default;
int WaitForNestedResult() {
@@ -3050,8 +3054,6 @@
TransportClientSocketPool* const pool_;
ClientSocketHandle handle_;
TestCompletionCallback nested_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ConnectWithinCallback);
};
TEST_F(ClientSocketPoolBaseTest, AbortAllRequestsOnFlush) {
@@ -5153,6 +5155,10 @@
class TestAuthHelper {
public:
TestAuthHelper() = default;
+
+ TestAuthHelper(const TestAuthHelper&) = delete;
+ TestAuthHelper& operator=(const TestAuthHelper&) = delete;
+
~TestAuthHelper() = default;
void InitHandle(
@@ -5242,8 +5248,6 @@
ClientSocketHandle handle_;
int auth_count_ = 0;
TestCompletionCallback callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TestAuthHelper);
};
TEST_F(ClientSocketPoolBaseTest, ProxyAuthOnce) {
diff --git a/net/socket/client_socket_pool_manager_impl.h b/net/socket/client_socket_pool_manager_impl.h
index 474966e..f70679a 100644
--- a/net/socket/client_socket_pool_manager_impl.h
+++ b/net/socket/client_socket_pool_manager_impl.h
@@ -34,6 +34,11 @@
const CommonConnectJobParams& common_connect_job_params,
const CommonConnectJobParams& websocket_common_connect_job_params,
HttpNetworkSession::SocketPoolType pool_type);
+
+ ClientSocketPoolManagerImpl(const ClientSocketPoolManagerImpl&) = delete;
+ ClientSocketPoolManagerImpl& operator=(const ClientSocketPoolManagerImpl&) =
+ delete;
+
~ClientSocketPoolManagerImpl() override;
void FlushSocketPoolsWithError(int net_error,
@@ -58,8 +63,6 @@
SocketPoolMap socket_pools_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl);
};
} // namespace net
diff --git a/net/socket/connect_job.h b/net/socket/connect_job.h
index a662e0e..a5df43c 100644
--- a/net/socket/connect_job.h
+++ b/net/socket/connect_job.h
@@ -126,6 +126,10 @@
class NET_EXPORT_PRIVATE Delegate {
public:
Delegate() {}
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate() {}
// Alerts the delegate that the connection completed. |job| must be
@@ -147,9 +151,6 @@
HttpAuthController* auth_controller,
base::OnceClosure restart_with_auth_callback,
ConnectJob* job) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
// A |timeout_duration| of 0 corresponds to no timeout.
@@ -167,6 +168,10 @@
const NetLogWithSource* net_log,
NetLogSourceType net_log_source_type,
NetLogEventType net_log_connect_event_type);
+
+ ConnectJob(const ConnectJob&) = delete;
+ ConnectJob& operator=(const ConnectJob&) = delete;
+
virtual ~ConnectJob();
// Accessors
@@ -308,8 +313,6 @@
const bool top_level_job_;
NetLogWithSource net_log_;
const NetLogEventType net_log_connect_event_type_;
-
- DISALLOW_COPY_AND_ASSIGN(ConnectJob);
};
} // namespace net
diff --git a/net/socket/connect_job_test_util.h b/net/socket/connect_job_test_util.h
index d6cc9f9..68a4da6e 100644
--- a/net/socket/connect_job_test_util.h
+++ b/net/socket/connect_job_test_util.h
@@ -31,6 +31,10 @@
explicit TestConnectJobDelegate(
SocketExpected socket_expected = SocketExpected::ON_SUCCESS_ONLY);
+
+ TestConnectJobDelegate(const TestConnectJobDelegate&) = delete;
+ TestConnectJobDelegate& operator=(const TestConnectJobDelegate&) = delete;
+
~TestConnectJobDelegate() override;
// ConnectJob::Delegate implementation.
@@ -84,8 +88,6 @@
base::RunLoop run_loop_;
std::unique_ptr<base::RunLoop> auth_challenge_run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(TestConnectJobDelegate);
};
} // namespace net
diff --git a/net/socket/fuzzed_datagram_client_socket.h b/net/socket/fuzzed_datagram_client_socket.h
index f53eaec..d13b2e49e 100644
--- a/net/socket/fuzzed_datagram_client_socket.h
+++ b/net/socket/fuzzed_datagram_client_socket.h
@@ -29,6 +29,11 @@
public:
// |data_provider| must outlive the created socket.
explicit FuzzedDatagramClientSocket(FuzzedDataProvider* data_provider);
+
+ FuzzedDatagramClientSocket(const FuzzedDatagramClientSocket&) = delete;
+ FuzzedDatagramClientSocket& operator=(const FuzzedDatagramClientSocket&) =
+ delete;
+
~FuzzedDatagramClientSocket() override;
// DatagramClientSocket implementation:
@@ -92,8 +97,6 @@
IPEndPoint remote_address_;
base::WeakPtrFactory<FuzzedDatagramClientSocket> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FuzzedDatagramClientSocket);
};
} // namespace net
diff --git a/net/socket/fuzzed_server_socket.h b/net/socket/fuzzed_server_socket.h
index 7d8dc80..cdcc339 100644
--- a/net/socket/fuzzed_server_socket.h
+++ b/net/socket/fuzzed_server_socket.h
@@ -32,6 +32,10 @@
// must remain valid until after both this object and the StreamSocket
// produced by Accept are destroyed.
FuzzedServerSocket(FuzzedDataProvider* data_provider, net::NetLog* net_log);
+
+ FuzzedServerSocket(const FuzzedServerSocket&) = delete;
+ FuzzedServerSocket& operator=(const FuzzedServerSocket&) = delete;
+
~FuzzedServerSocket() override;
int Listen(const IPEndPoint& address, int backlog) override;
@@ -52,7 +56,6 @@
bool listen_called_;
base::WeakPtrFactory<FuzzedServerSocket> weak_factory_{this};
- DISALLOW_COPY_AND_ASSIGN(FuzzedServerSocket);
};
} // namespace net
diff --git a/net/socket/fuzzed_socket.h b/net/socket/fuzzed_socket.h
index 8e420c1..3cfc6238 100644
--- a/net/socket/fuzzed_socket.h
+++ b/net/socket/fuzzed_socket.h
@@ -42,6 +42,10 @@
// |data_provider| is used as to determine behavior of the FuzzedSocket. It
// must remain valid until after the FuzzedSocket is destroyed.
FuzzedSocket(FuzzedDataProvider* data_provider, net::NetLog* net_log);
+
+ FuzzedSocket(const FuzzedSocket&) = delete;
+ FuzzedSocket& operator=(const FuzzedSocket&) = delete;
+
~FuzzedSocket() override;
// If set to true, the socket will fuzz the result of the Connect() call.
@@ -132,8 +136,6 @@
IPEndPoint remote_address_;
base::WeakPtrFactory<FuzzedSocket> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FuzzedSocket);
};
} // namespace net
diff --git a/net/socket/fuzzed_socket_factory.cc b/net/socket/fuzzed_socket_factory.cc
index fc7da365..2c77be9 100644
--- a/net/socket/fuzzed_socket_factory.cc
+++ b/net/socket/fuzzed_socket_factory.cc
@@ -28,6 +28,10 @@
class FailingSSLClientSocket : public SSLClientSocket {
public:
FailingSSLClientSocket() = default;
+
+ FailingSSLClientSocket(const FailingSSLClientSocket&) = delete;
+ FailingSSLClientSocket& operator=(const FailingSSLClientSocket&) = delete;
+
~FailingSSLClientSocket() override = default;
// Socket implementation:
@@ -100,8 +104,6 @@
private:
NetLogWithSource net_log_;
-
- DISALLOW_COPY_AND_ASSIGN(FailingSSLClientSocket);
};
} // namespace
diff --git a/net/socket/fuzzed_socket_factory.h b/net/socket/fuzzed_socket_factory.h
index 5d1940a..3ecd386c 100644
--- a/net/socket/fuzzed_socket_factory.h
+++ b/net/socket/fuzzed_socket_factory.h
@@ -32,6 +32,10 @@
// long as their calls into it are made on the CLientSocketFactory's thread
// and the calls are deterministic.
explicit FuzzedSocketFactory(FuzzedDataProvider* data_provider);
+
+ FuzzedSocketFactory(const FuzzedSocketFactory&) = delete;
+ FuzzedSocketFactory& operator=(const FuzzedSocketFactory&) = delete;
+
~FuzzedSocketFactory() override;
std::unique_ptr<DatagramClientSocket> CreateDatagramClientSocket(
@@ -71,8 +75,6 @@
private:
FuzzedDataProvider* data_provider_;
bool fuzz_connect_result_;
-
- DISALLOW_COPY_AND_ASSIGN(FuzzedSocketFactory);
};
} // namespace net
diff --git a/net/socket/mock_client_socket_pool_manager.h b/net/socket/mock_client_socket_pool_manager.h
index 9d29aa8..ea1891c 100644
--- a/net/socket/mock_client_socket_pool_manager.h
+++ b/net/socket/mock_client_socket_pool_manager.h
@@ -21,6 +21,11 @@
class MockClientSocketPoolManager : public ClientSocketPoolManager {
public:
MockClientSocketPoolManager();
+
+ MockClientSocketPoolManager(const MockClientSocketPoolManager&) = delete;
+ MockClientSocketPoolManager& operator=(const MockClientSocketPoolManager&) =
+ delete;
+
~MockClientSocketPoolManager() override;
// Sets socket pool that gets used for the specified ProxyServer.
@@ -39,8 +44,6 @@
std::map<ProxyServer, std::unique_ptr<ClientSocketPool>>;
ClientSocketPoolMap socket_pools_;
-
- DISALLOW_COPY_AND_ASSIGN(MockClientSocketPoolManager);
};
} // namespace net
diff --git a/net/socket/server_socket.h b/net/socket/server_socket.h
index 210e47f..9575c748 100644
--- a/net/socket/server_socket.h
+++ b/net/socket/server_socket.h
@@ -22,6 +22,10 @@
class NET_EXPORT ServerSocket {
public:
ServerSocket();
+
+ ServerSocket(const ServerSocket&) = delete;
+ ServerSocket& operator=(const ServerSocket&) = delete;
+
virtual ~ServerSocket();
// Binds the socket and starts listening. Destroys the socket to stop
@@ -48,9 +52,6 @@
virtual int Accept(std::unique_ptr<StreamSocket>* socket,
CompletionOnceCallback callback,
IPEndPoint* peer_address);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServerSocket);
};
} // namespace net
diff --git a/net/socket/socket_performance_watcher_factory.h b/net/socket/socket_performance_watcher_factory.h
index bb78a56..4925332 100644
--- a/net/socket/socket_performance_watcher_factory.h
+++ b/net/socket/socket_performance_watcher_factory.h
@@ -23,6 +23,11 @@
// |SocketPerformanceWatcherFactory|.
enum Protocol { PROTOCOL_TCP, PROTOCOL_QUIC };
+ SocketPerformanceWatcherFactory(const SocketPerformanceWatcherFactory&) =
+ delete;
+ SocketPerformanceWatcherFactory& operator=(
+ const SocketPerformanceWatcherFactory&) = delete;
+
virtual ~SocketPerformanceWatcherFactory() {}
// Creates a socket performance watcher that will record statistics for a
@@ -37,9 +42,6 @@
protected:
SocketPerformanceWatcherFactory() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SocketPerformanceWatcherFactory);
};
} // namespace net
diff --git a/net/socket/socket_posix.h b/net/socket/socket_posix.h
index dc3f210..23259b3 100644
--- a/net/socket/socket_posix.h
+++ b/net/socket/socket_posix.h
@@ -28,6 +28,10 @@
: public base::MessagePumpForIO::FdWatcher {
public:
SocketPosix();
+
+ SocketPosix(const SocketPosix&) = delete;
+ SocketPosix& operator=(const SocketPosix&) = delete;
+
~SocketPosix() override;
// Opens a socket and returns net::OK if |address_family| is AF_INET, AF_INET6
@@ -152,8 +156,6 @@
std::unique_ptr<SockaddrStorage> peer_address_;
base::ThreadChecker thread_checker_;
-
- DISALLOW_COPY_AND_ASSIGN(SocketPosix);
};
} // namespace net
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index a9438a4..a14c6bd0 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -223,6 +223,10 @@
class SocketDataProvider {
public:
SocketDataProvider();
+
+ SocketDataProvider(const SocketDataProvider&) = delete;
+ SocketDataProvider& operator=(const SocketDataProvider&) = delete;
+
virtual ~SocketDataProvider();
// Returns the buffer and result code for the next simulated read.
@@ -326,8 +330,6 @@
int set_send_buffer_size_result_ = net::OK;
bool set_no_delay_result_ = true;
bool set_keep_alive_result_ = true;
-
- DISALLOW_COPY_AND_ASSIGN(SocketDataProvider);
};
// The AsyncSocket is an interface used by the SocketDataProvider to
@@ -368,6 +370,10 @@
public:
StaticSocketDataHelper(base::span<const MockRead> reads,
base::span<const MockWrite> writes);
+
+ StaticSocketDataHelper(const StaticSocketDataHelper&) = delete;
+ StaticSocketDataHelper& operator=(const StaticSocketDataHelper&) = delete;
+
~StaticSocketDataHelper();
// These functions get access to the next available read and write data. They
@@ -404,8 +410,6 @@
size_t read_index_;
const base::span<const MockWrite> writes_;
size_t write_index_;
-
- DISALLOW_COPY_AND_ASSIGN(StaticSocketDataHelper);
};
// SocketDataProvider which responds based on static tables of mock reads and
@@ -415,6 +419,10 @@
StaticSocketDataProvider();
StaticSocketDataProvider(base::span<const MockRead> reads,
base::span<const MockWrite> writes);
+
+ StaticSocketDataProvider(const StaticSocketDataProvider&) = delete;
+ StaticSocketDataProvider& operator=(const StaticSocketDataProvider&) = delete;
+
~StaticSocketDataProvider() override;
// Pause/resume reads from this provider.
@@ -441,8 +449,6 @@
StaticSocketDataHelper helper_;
SocketDataPrinter* printer_ = nullptr;
bool paused_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(StaticSocketDataProvider);
};
// ProxyClientSocketDataProvider only need to keep track of the return code from
@@ -530,6 +536,9 @@
base::span<const MockRead> reads,
base::span<const MockWrite> writes);
+ SequencedSocketData(const SequencedSocketData&) = delete;
+ SequencedSocketData& operator=(const SequencedSocketData&) = delete;
+
~SequencedSocketData() override;
// From SocketDataProvider:
@@ -598,8 +607,6 @@
std::unique_ptr<base::RunLoop> run_until_paused_run_loop_;
base::WeakPtrFactory<SequencedSocketData> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SequencedSocketData);
};
// Holds an array of SocketDataProvider elements. As Mock{TCP,SSL}StreamSocket
@@ -655,6 +662,10 @@
class MockClientSocketFactory : public ClientSocketFactory {
public:
MockClientSocketFactory();
+
+ MockClientSocketFactory(const MockClientSocketFactory&) = delete;
+ MockClientSocketFactory& operator=(const MockClientSocketFactory&) = delete;
+
~MockClientSocketFactory() override;
// Adds a SocketDataProvider that can be used to served either TCP or UDP
@@ -725,8 +736,6 @@
// ERR_READ_IF_READY_NOT_IMPLEMENTED.
bool enable_read_if_ready_;
bool use_mock_proxy_client_sockets_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(MockClientSocketFactory);
};
class MockClientSocket : public TransportClientSocket {
@@ -792,6 +801,10 @@
MockTCPClientSocket(const AddressList& addresses,
net::NetLog* net_log,
SocketDataProvider* socket);
+
+ MockTCPClientSocket(const MockTCPClientSocket&) = delete;
+ MockTCPClientSocket& operator=(const MockTCPClientSocket&) = delete;
+
~MockTCPClientSocket() override;
const AddressList& addresses() const { return addresses_; }
@@ -879,8 +892,6 @@
BeforeConnectCallback before_connect_callback_;
ConnectionAttempts connection_attempts_;
-
- DISALLOW_COPY_AND_ASSIGN(MockTCPClientSocket);
};
class MockProxyClientSocket : public AsyncSocket, public ProxyClientSocket {
@@ -888,6 +899,10 @@
MockProxyClientSocket(std::unique_ptr<StreamSocket> socket,
HttpAuthController* auth_controller,
ProxyClientSocketDataProvider* data);
+
+ MockProxyClientSocket(const MockProxyClientSocket&) = delete;
+ MockProxyClientSocket& operator=(const MockProxyClientSocket&) = delete;
+
~MockProxyClientSocket() override;
// ProxyClientSocket implementation.
const HttpResponseInfo* GetConnectResponseInfo() const override;
@@ -944,8 +959,6 @@
scoped_refptr<HttpAuthController> auth_controller_;
base::WeakPtrFactory<MockProxyClientSocket> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MockProxyClientSocket);
};
class MockSSLClientSocket : public AsyncSocket, public SSLClientSocket {
@@ -954,6 +967,10 @@
const HostPortPair& host_and_port,
const SSLConfig& ssl_config,
SSLSocketDataProvider* socket);
+
+ MockSSLClientSocket(const MockSSLClientSocket&) = delete;
+ MockSSLClientSocket& operator=(const MockSSLClientSocket&) = delete;
+
~MockSSLClientSocket() override;
// Socket implementation.
@@ -1028,14 +1045,16 @@
IPEndPoint peer_addr_;
base::WeakPtrFactory<MockSSLClientSocket> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MockSSLClientSocket);
};
class MockUDPClientSocket : public DatagramClientSocket, public AsyncSocket {
public:
MockUDPClientSocket(SocketDataProvider* data = nullptr,
net::NetLog* net_log = nullptr);
+
+ MockUDPClientSocket(const MockUDPClientSocket&) = delete;
+ MockUDPClientSocket& operator=(const MockUDPClientSocket&) = delete;
+
~MockUDPClientSocket() override;
// Socket implementation.
@@ -1139,14 +1158,16 @@
bool tagged_before_data_transferred_ = true;
base::WeakPtrFactory<MockUDPClientSocket> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(MockUDPClientSocket);
};
class TestSocketRequest : public TestCompletionCallbackBase {
public:
TestSocketRequest(std::vector<TestSocketRequest*>* request_order,
size_t* completion_count);
+
+ TestSocketRequest(const TestSocketRequest&) = delete;
+ TestSocketRequest& operator=(const TestSocketRequest&) = delete;
+
~TestSocketRequest() override;
ClientSocketHandle* handle() { return &handle_; }
@@ -1162,8 +1183,6 @@
ClientSocketHandle handle_;
std::vector<TestSocketRequest*>* request_order_;
size_t* completion_count_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSocketRequest);
};
class ClientSocketPoolTest {
@@ -1179,6 +1198,10 @@
static const int kRequestNotFound;
ClientSocketPoolTest();
+
+ ClientSocketPoolTest(const ClientSocketPoolTest&) = delete;
+ ClientSocketPoolTest& operator=(const ClientSocketPoolTest&) = delete;
+
~ClientSocketPoolTest();
template <typename PoolType>
@@ -1228,8 +1251,6 @@
std::vector<std::unique_ptr<TestSocketRequest>> requests_;
std::vector<TestSocketRequest*> request_order_;
size_t completion_count_;
-
- DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolTest);
};
class MockTransportSocketParams
@@ -1250,6 +1271,10 @@
const SocketTag& socket_tag,
CompletionOnceCallback callback,
RequestPriority priority);
+
+ MockConnectJob(const MockConnectJob&) = delete;
+ MockConnectJob& operator=(const MockConnectJob&) = delete;
+
~MockConnectJob();
int Connect();
@@ -1268,8 +1293,6 @@
const SocketTag socket_tag_;
CompletionOnceCallback user_callback_;
RequestPriority priority_;
-
- DISALLOW_COPY_AND_ASSIGN(MockConnectJob);
};
MockTransportClientSocketPool(
@@ -1376,6 +1399,10 @@
public:
explicit MockTaggingStreamSocket(std::unique_ptr<StreamSocket> transport)
: WrappedStreamSocket(std::move(transport)) {}
+
+ MockTaggingStreamSocket(const MockTaggingStreamSocket&) = delete;
+ MockTaggingStreamSocket& operator=(const MockTaggingStreamSocket&) = delete;
+
~MockTaggingStreamSocket() override {}
// StreamSocket implementation.
@@ -1393,8 +1420,6 @@
bool connected_ = false;
bool tagged_before_connected_ = true;
SocketTag tag_;
-
- DISALLOW_COPY_AND_ASSIGN(MockTaggingStreamSocket);
};
// Extend MockClientSocketFactory to return MockTaggingStreamSockets and
diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h
index 58f3d128..55b5afcf 100644
--- a/net/socket/socks5_client_socket.h
+++ b/net/socket/socks5_client_socket.h
@@ -40,6 +40,9 @@
const HostPortPair& destination,
const NetworkTrafficAnnotationTag& traffic_annotation);
+ SOCKS5ClientSocket(const SOCKS5ClientSocket&) = delete;
+ SOCKS5ClientSocket& operator=(const SOCKS5ClientSocket&) = delete;
+
// On destruction Disconnect() is called.
~SOCKS5ClientSocket() override;
@@ -158,8 +161,6 @@
// Traffic annotation for socket control.
NetworkTrafficAnnotationTag traffic_annotation_;
-
- DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocket);
};
} // namespace net
diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
index 9005b12..0788522 100644
--- a/net/socket/socks_client_socket.h
+++ b/net/socket/socks_client_socket.h
@@ -42,6 +42,9 @@
SecureDnsPolicy secure_dns_policy,
const NetworkTrafficAnnotationTag& traffic_annotation);
+ SOCKSClientSocket(const SOCKSClientSocket&) = delete;
+ SOCKSClientSocket& operator=(const SOCKSClientSocket&) = delete;
+
// On destruction Disconnect() is called.
~SOCKSClientSocket() override;
@@ -155,8 +158,6 @@
// Traffic annotation for socket control.
NetworkTrafficAnnotationTag traffic_annotation_;
-
- DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket);
};
} // namespace net
diff --git a/net/socket/socks_connect_job.h b/net/socket/socks_connect_job.h
index 9603328..4123642d 100644
--- a/net/socket/socks_connect_job.h
+++ b/net/socket/socks_connect_job.h
@@ -89,6 +89,10 @@
scoped_refptr<SOCKSSocketParams> socks_params,
ConnectJob::Delegate* delegate,
const NetLogWithSource* net_log);
+
+ SOCKSConnectJob(const SOCKSConnectJob&) = delete;
+ SOCKSConnectJob& operator=(const SOCKSConnectJob&) = delete;
+
~SOCKSConnectJob() override;
// ConnectJob methods.
@@ -140,8 +144,6 @@
SOCKSClientSocket* socks_socket_ptr_;
ResolveErrorInfo resolve_error_info_;
-
- DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJob);
};
} // namespace net
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index 8d5753c..c1e41ed 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -105,6 +105,10 @@
CTPolicyEnforcer* ct_policy_enforcer,
SSLClientSessionCache* ssl_client_session_cache,
SCTAuditingDelegate* sct_auditing_delegate);
+
+ SSLClientContext(const SSLClientContext&) = delete;
+ SSLClientContext& operator=(const SSLClientContext&) = delete;
+
~SSLClientContext() override;
const SSLContextConfig& config() { return config_; }
@@ -188,8 +192,6 @@
SSLClientAuthCache ssl_client_auth_cache_;
base::ObserverList<Observer, true /* check_empty */> observers_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLClientContext);
};
} // namespace net
diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h
index 68e8c79a..85ac408 100644
--- a/net/socket/ssl_client_socket_impl.h
+++ b/net/socket/ssl_client_socket_impl.h
@@ -59,6 +59,10 @@
std::unique_ptr<StreamSocket> stream_socket,
const HostPortPair& host_and_port,
const SSLConfig& ssl_config);
+
+ SSLClientSocketImpl(const SSLClientSocketImpl&) = delete;
+ SSLClientSocketImpl& operator=(const SSLClientSocketImpl&) = delete;
+
~SSLClientSocketImpl() override;
const HostPortPair& host_and_port() const { return host_and_port_; }
@@ -301,8 +305,6 @@
NetLogWithSource net_log_;
base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SSLClientSocketImpl);
};
} // namespace net
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index ff695d7..d34fe85 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -143,6 +143,11 @@
public:
explicit SynchronousErrorStreamSocket(std::unique_ptr<StreamSocket> transport)
: WrappedStreamSocket(std::move(transport)) {}
+
+ SynchronousErrorStreamSocket(const SynchronousErrorStreamSocket&) = delete;
+ SynchronousErrorStreamSocket& operator=(const SynchronousErrorStreamSocket&) =
+ delete;
+
~SynchronousErrorStreamSocket() override = default;
// Socket implementation:
@@ -183,8 +188,6 @@
bool have_write_error_ = false;
int pending_write_error_ = OK;
-
- DISALLOW_COPY_AND_ASSIGN(SynchronousErrorStreamSocket);
};
int SynchronousErrorStreamSocket::Read(IOBuffer* buf,
@@ -560,6 +563,10 @@
class DeleteSocketCallback : public TestCompletionCallbackBase {
public:
explicit DeleteSocketCallback(StreamSocket* socket) : socket_(socket) {}
+
+ DeleteSocketCallback(const DeleteSocketCallback&) = delete;
+ DeleteSocketCallback& operator=(const DeleteSocketCallback&) = delete;
+
~DeleteSocketCallback() override = default;
CompletionOnceCallback callback() {
@@ -579,8 +586,6 @@
}
StreamSocket* socket_;
-
- DISALLOW_COPY_AND_ASSIGN(DeleteSocketCallback);
};
// A mock ExpectCTReporter that remembers the latest violation that was
@@ -1328,6 +1333,10 @@
class ZeroRTTResponse : public test_server::HttpResponse {
public:
ZeroRTTResponse(bool zero_rtt) : zero_rtt_(zero_rtt) {}
+
+ ZeroRTTResponse(const ZeroRTTResponse&) = delete;
+ ZeroRTTResponse& operator=(const ZeroRTTResponse&) = delete;
+
~ZeroRTTResponse() override {}
void SendResponse(const test_server::SendBytesCallback& send,
@@ -1347,8 +1356,6 @@
private:
bool zero_rtt_;
-
- DISALLOW_COPY_AND_ASSIGN(ZeroRTTResponse);
};
std::unique_ptr<test_server::HttpResponse> HandleZeroRTTRequest(
diff --git a/net/socket/ssl_connect_job.h b/net/socket/ssl_connect_job.h
index 40cd4d85..d32744d 100644
--- a/net/socket/ssl_connect_job.h
+++ b/net/socket/ssl_connect_job.h
@@ -109,6 +109,10 @@
scoped_refptr<SSLSocketParams> params,
ConnectJob::Delegate* delegate,
const NetLogWithSource* net_log);
+
+ SSLConnectJob(const SSLConnectJob&) = delete;
+ SSLConnectJob& operator=(const SSLConnectJob&) = delete;
+
~SSLConnectJob() override;
// ConnectJob methods.
@@ -201,8 +205,6 @@
// limited lifetime and the aliases can no longer be retrieved from there by
// by the time that the aliases are needed to be passed in SetSocket.
std::vector<std::string> dns_aliases_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLConnectJob);
};
} // namespace net
diff --git a/net/socket/ssl_server_socket_impl.cc b/net/socket/ssl_server_socket_impl.cc
index fefeef4..4bed18d 100644
--- a/net/socket/ssl_server_socket_impl.cc
+++ b/net/socket/ssl_server_socket_impl.cc
@@ -71,6 +71,10 @@
public:
SocketImpl(SSLServerContextImpl* context,
std::unique_ptr<StreamSocket> socket);
+
+ SocketImpl(const SocketImpl&) = delete;
+ SocketImpl& operator=(const SocketImpl&) = delete;
+
~SocketImpl() override;
// SSLServerSocket interface.
@@ -220,8 +224,6 @@
NextProto negotiated_protocol_;
base::WeakPtrFactory<SocketImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SocketImpl);
};
SSLServerContextImpl::SocketImpl::SocketImpl(
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index f527d36..d98f8f5 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -225,6 +225,9 @@
FakeDataChannel* outgoing_channel)
: incoming_(incoming_channel), outgoing_(outgoing_channel) {}
+ FakeSocket(const FakeSocket&) = delete;
+ FakeSocket& operator=(const FakeSocket&) = delete;
+
~FakeSocket() override = default;
int Read(IOBuffer* buf,
@@ -299,8 +302,6 @@
NetLogWithSource net_log_;
FakeDataChannel* incoming_;
FakeDataChannel* outgoing_;
-
- DISALLOW_COPY_AND_ASSIGN(FakeSocket);
};
} // namespace
diff --git a/net/socket/tcp_client_socket.h b/net/socket/tcp_client_socket.h
index c3888a9..fbcb7e9 100644
--- a/net/socket/tcp_client_socket.h
+++ b/net/socket/tcp_client_socket.h
@@ -72,6 +72,9 @@
const IPEndPoint& bound_address,
NetworkQualityEstimator* network_quality_estimator);
+ TCPClientSocket(const TCPClientSocket&) = delete;
+ TCPClientSocket& operator=(const TCPClientSocket&) = delete;
+
~TCPClientSocket() override;
// TransportClientSocket implementation.
@@ -233,8 +236,6 @@
base::OneShotTimer connect_attempt_timer_;
base::WeakPtrFactory<TCPClientSocket> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TCPClientSocket);
};
} // namespace net
diff --git a/net/socket/tcp_client_socket_unittest.cc b/net/socket/tcp_client_socket_unittest.cc
index 06a4e94..5444c7f5 100644
--- a/net/socket/tcp_client_socket_unittest.cc
+++ b/net/socket/tcp_client_socket_unittest.cc
@@ -295,6 +295,11 @@
class TestSocketPerformanceWatcher : public SocketPerformanceWatcher {
public:
TestSocketPerformanceWatcher() : connection_changed_count_(0u) {}
+
+ TestSocketPerformanceWatcher(const TestSocketPerformanceWatcher&) = delete;
+ TestSocketPerformanceWatcher& operator=(const TestSocketPerformanceWatcher&) =
+ delete;
+
~TestSocketPerformanceWatcher() override = default;
bool ShouldNotifyUpdatedRTT() const override { return true; }
@@ -307,8 +312,6 @@
private:
size_t connection_changed_count_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSocketPerformanceWatcher);
};
// TestSocketPerformanceWatcher requires kernel support for tcp_info struct, and
diff --git a/net/socket/tcp_server_socket.h b/net/socket/tcp_server_socket.h
index 8e5c9e5f..9c2b856 100644
--- a/net/socket/tcp_server_socket.h
+++ b/net/socket/tcp_server_socket.h
@@ -28,6 +28,9 @@
// Adopts the provided socket, which must not be a connected socket.
explicit TCPServerSocket(std::unique_ptr<TCPSocket> socket);
+ TCPServerSocket(const TCPServerSocket&) = delete;
+ TCPServerSocket& operator=(const TCPServerSocket&) = delete;
+
~TCPServerSocket() override;
// Takes ownership of |socket|, which has been opened, but may or may not be
@@ -70,8 +73,6 @@
std::unique_ptr<TCPSocket> accepted_socket_;
IPEndPoint accepted_address_;
bool pending_accept_;
-
- DISALLOW_COPY_AND_ASSIGN(TCPServerSocket);
};
} // namespace net
diff --git a/net/socket/tcp_socket_posix.h b/net/socket/tcp_socket_posix.h
index 31430b61..32cf724 100644
--- a/net/socket/tcp_socket_posix.h
+++ b/net/socket/tcp_socket_posix.h
@@ -43,6 +43,10 @@
std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher,
NetLog* net_log,
const NetLogSource& source);
+
+ TCPSocketPosix(const TCPSocketPosix&) = delete;
+ TCPSocketPosix& operator=(const TCPSocketPosix&) = delete;
+
virtual ~TCPSocketPosix();
// Opens the socket.
@@ -211,8 +215,6 @@
// Current socket tag if |socket_| is valid, otherwise the tag to apply when
// |socket_| is opened.
SocketTag tag_;
-
- DISALLOW_COPY_AND_ASSIGN(TCPSocketPosix);
};
} // namespace net
diff --git a/net/socket/tcp_socket_unittest.cc b/net/socket/tcp_socket_unittest.cc
index 96ccee3..74f8e1d 100644
--- a/net/socket/tcp_socket_unittest.cc
+++ b/net/socket/tcp_socket_unittest.cc
@@ -73,6 +73,11 @@
: should_notify_updated_rtt_(should_notify_updated_rtt),
connection_changed_count_(0u),
rtt_notification_count_(0u) {}
+
+ TestSocketPerformanceWatcher(const TestSocketPerformanceWatcher&) = delete;
+ TestSocketPerformanceWatcher& operator=(const TestSocketPerformanceWatcher&) =
+ delete;
+
~TestSocketPerformanceWatcher() override = default;
bool ShouldNotifyUpdatedRTT() const override {
@@ -93,8 +98,6 @@
const bool should_notify_updated_rtt_;
size_t connection_changed_count_;
size_t rtt_notification_count_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSocketPerformanceWatcher);
};
const int kListenBacklog = 5;
diff --git a/net/socket/tcp_socket_win.h b/net/socket/tcp_socket_win.h
index 8decd5d5..542bf8d 100644
--- a/net/socket/tcp_socket_win.h
+++ b/net/socket/tcp_socket_win.h
@@ -38,6 +38,10 @@
std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher,
NetLog* net_log,
const NetLogSource& source);
+
+ TCPSocketWin(const TCPSocketWin&) = delete;
+ TCPSocketWin& operator=(const TCPSocketWin&) = delete;
+
~TCPSocketWin() override;
int Open(AddressFamily family);
@@ -199,8 +203,6 @@
NetLogWithSource net_log_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(TCPSocketWin);
};
} // namespace net
diff --git a/net/socket/transport_client_socket.h b/net/socket/transport_client_socket.h
index 4f8c4b3f..548048e 100644
--- a/net/socket/transport_client_socket.h
+++ b/net/socket/transport_client_socket.h
@@ -17,6 +17,10 @@
class NET_EXPORT TransportClientSocket : public StreamSocket {
public:
TransportClientSocket();
+
+ TransportClientSocket(const TransportClientSocket&) = delete;
+ TransportClientSocket& operator=(const TransportClientSocket&) = delete;
+
~TransportClientSocket() override;
// Binds the socket to a local address, |local_addr|. Returns OK on success,
@@ -46,9 +50,6 @@
// should always be ready after successful connection or slightly earlier
// during BeforeConnect handlers.
virtual bool SetKeepAlive(bool enable, int delay_secs);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TransportClientSocket);
};
} // namespace net
diff --git a/net/socket/transport_client_socket_pool.h b/net/socket/transport_client_socket_pool.h
index 054a11b..ab8aa9e4 100644
--- a/net/socket/transport_client_socket_pool.h
+++ b/net/socket/transport_client_socket_pool.h
@@ -101,6 +101,9 @@
const absl::optional<NetworkTrafficAnnotationTag>& proxy_annotation_tag,
const NetLogWithSource& net_log);
+ Request(const Request&) = delete;
+ Request& operator=(const Request&) = delete;
+
~Request();
ClientSocketHandle* handle() const { return handle_; }
@@ -141,8 +144,6 @@
const NetLogWithSource net_log_;
const SocketTag socket_tag_;
ConnectJob* job_;
-
- DISALLOW_COPY_AND_ASSIGN(Request);
};
TransportClientSocketPool(
diff --git a/net/socket/transport_client_socket_pool_test_util.h b/net/socket/transport_client_socket_pool_test_util.h
index f6dfb7b..91b69d3 100644
--- a/net/socket/transport_client_socket_pool_test_util.h
+++ b/net/socket/transport_client_socket_pool_test_util.h
@@ -72,6 +72,12 @@
};
explicit MockTransportClientSocketFactory(NetLog* net_log);
+
+ MockTransportClientSocketFactory(const MockTransportClientSocketFactory&) =
+ delete;
+ MockTransportClientSocketFactory& operator=(
+ const MockTransportClientSocketFactory&) = delete;
+
~MockTransportClientSocketFactory() override;
std::unique_ptr<DatagramClientSocket> CreateDatagramClientSocket(
@@ -135,8 +141,6 @@
base::TimeDelta delay_;
base::queue<base::OnceClosure> triggerable_sockets_;
base::OnceClosure run_loop_quit_closure_;
-
- DISALLOW_COPY_AND_ASSIGN(MockTransportClientSocketFactory);
};
} // namespace net
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index e200a8a..d6afa3ca 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -864,6 +864,9 @@
pool_(pool),
within_callback_(false) {}
+ RequestSocketCallback(const RequestSocketCallback&) = delete;
+ RequestSocketCallback& operator=(const RequestSocketCallback&) = delete;
+
~RequestSocketCallback() override = default;
CompletionOnceCallback callback() {
@@ -897,8 +900,6 @@
ClientSocketHandle* const handle_;
TransportClientSocketPool* const pool_;
bool within_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(RequestSocketCallback);
};
TEST_F(TransportClientSocketPoolTest, RequestTwice) {
diff --git a/net/socket/transport_connect_job.h b/net/socket/transport_connect_job.h
index acf2c6b..ea04557a 100644
--- a/net/socket/transport_connect_job.h
+++ b/net/socket/transport_connect_job.h
@@ -129,6 +129,10 @@
const scoped_refptr<TransportSocketParams>& params,
Delegate* delegate,
const NetLogWithSource* net_log);
+
+ TransportConnectJob(const TransportConnectJob&) = delete;
+ TransportConnectJob& operator=(const TransportConnectJob&) = delete;
+
~TransportConnectJob() override;
// ConnectJob methods.
@@ -205,8 +209,6 @@
ConnectionAttempts fallback_connection_attempts_;
base::WeakPtrFactory<TransportConnectJob> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(TransportConnectJob);
};
} // namespace net
diff --git a/net/socket/udp_client_socket.h b/net/socket/udp_client_socket.h
index d8a7348c..d576370 100644
--- a/net/socket/udp_client_socket.h
+++ b/net/socket/udp_client_socket.h
@@ -24,6 +24,10 @@
UDPClientSocket(DatagramSocket::BindType bind_type,
net::NetLog* net_log,
const net::NetLogSource& source);
+
+ UDPClientSocket(const UDPClientSocket&) = delete;
+ UDPClientSocket& operator=(const UDPClientSocket&) = delete;
+
~UDPClientSocket() override;
// DatagramClientSocket implementation.
@@ -78,8 +82,6 @@
private:
UDPSocket socket_;
NetworkChangeNotifier::NetworkHandle network_;
-
- DISALLOW_COPY_AND_ASSIGN(UDPClientSocket);
};
} // namespace net
diff --git a/net/socket/udp_server_socket.h b/net/socket/udp_server_socket.h
index 37ba36bba..54456c6 100644
--- a/net/socket/udp_server_socket.h
+++ b/net/socket/udp_server_socket.h
@@ -24,6 +24,10 @@
class NET_EXPORT UDPServerSocket : public DatagramServerSocket {
public:
UDPServerSocket(net::NetLog* net_log, const net::NetLogSource& source);
+
+ UDPServerSocket(const UDPServerSocket&) = delete;
+ UDPServerSocket& operator=(const UDPServerSocket&) = delete;
+
~UDPServerSocket() override;
// Implement DatagramServerSocket:
@@ -61,7 +65,6 @@
bool allow_address_reuse_;
bool allow_broadcast_;
bool allow_address_sharing_for_multicast_;
- DISALLOW_COPY_AND_ASSIGN(UDPServerSocket);
};
} // namespace net
diff --git a/net/socket/udp_socket_posix.h b/net/socket/udp_socket_posix.h
index 15aacb1..5fe0d8c 100644
--- a/net/socket/udp_socket_posix.h
+++ b/net/socket/udp_socket_posix.h
@@ -129,6 +129,10 @@
class ReceivedActivityMonitor {
public:
ReceivedActivityMonitor() : bytes_(0), increments_(0) {}
+
+ ReceivedActivityMonitor(const ReceivedActivityMonitor&) = delete;
+ ReceivedActivityMonitor& operator=(const ReceivedActivityMonitor&) = delete;
+
~ReceivedActivityMonitor() = default;
// Provided by sent/received subclass.
// Update throughput, but batch to limit overhead of net::activity_monitor.
@@ -143,7 +147,6 @@
uint32_t bytes_;
uint32_t increments_;
base::RepeatingTimer timer_;
- DISALLOW_COPY_AND_ASSIGN(ReceivedActivityMonitor);
};
UDPSocketPosix(DatagramSocket::BindType bind_type,
diff --git a/net/socket/udp_socket_win.h b/net/socket/udp_socket_win.h
index a75bd08..928515e 100644
--- a/net/socket/udp_socket_win.h
+++ b/net/socket/udp_socket_win.h
@@ -119,6 +119,10 @@
class NET_EXPORT DscpManager {
public:
DscpManager(QwaveApi* api, SOCKET socket);
+
+ DscpManager(const DscpManager&) = delete;
+ DscpManager& operator=(const DscpManager&) = delete;
+
~DscpManager();
// Remembers the latest |dscp| so PrepareToSend can add remote addresses to
@@ -149,8 +153,6 @@
// 0 means no flow has been constructed.
QOS_FLOWID flow_id_ = 0;
base::WeakPtrFactory<DscpManager> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(DscpManager);
};
//-----------------------------------------------------------------------------
@@ -162,6 +164,10 @@
UDPSocketWin(DatagramSocket::BindType bind_type,
net::NetLog* net_log,
const net::NetLogSource& source);
+
+ UDPSocketWin(const UDPSocketWin&) = delete;
+ UDPSocketWin& operator=(const UDPSocketWin&) = delete;
+
~UDPSocketWin() override;
// Opens the socket.
@@ -493,8 +499,6 @@
// Used to prevent null dereferences in OnObjectSignaled, when passing an
// error to both read and write callbacks. Cleared in Close()
base::WeakPtrFactory<UDPSocketWin> event_pending_{this};
-
- DISALLOW_COPY_AND_ASSIGN(UDPSocketWin);
};
//-----------------------------------------------------------------------------
diff --git a/net/socket/unix_domain_client_socket_posix.h b/net/socket/unix_domain_client_socket_posix.h
index 2397b91..e2c34ee7 100644
--- a/net/socket/unix_domain_client_socket_posix.h
+++ b/net/socket/unix_domain_client_socket_posix.h
@@ -34,6 +34,9 @@
// UnixDomainServerSocket uses this after it accepts a connection.
explicit UnixDomainClientSocket(std::unique_ptr<SocketPosix> socket);
+ UnixDomainClientSocket(const UnixDomainClientSocket&) = delete;
+ UnixDomainClientSocket& operator=(const UnixDomainClientSocket&) = delete;
+
~UnixDomainClientSocket() override;
// Fills |address| with |socket_path| and its length. For Android or Linux
@@ -83,8 +86,6 @@
// This net log is just to comply StreamSocket::NetLog(). It throws away
// everything.
NetLogWithSource net_log_;
-
- DISALLOW_COPY_AND_ASSIGN(UnixDomainClientSocket);
};
} // namespace net
diff --git a/net/socket/unix_domain_server_socket_posix.h b/net/socket/unix_domain_server_socket_posix.h
index 9da6bc0..8d3bdf8 100644
--- a/net/socket/unix_domain_server_socket_posix.h
+++ b/net/socket/unix_domain_server_socket_posix.h
@@ -47,6 +47,10 @@
UnixDomainServerSocket(const AuthCallback& auth_callack,
bool use_abstract_namespace);
+
+ UnixDomainServerSocket(const UnixDomainServerSocket&) = delete;
+ UnixDomainServerSocket& operator=(const UnixDomainServerSocket&) = delete;
+
~UnixDomainServerSocket() override;
// Gets credentials of peer to check permissions.
@@ -94,8 +98,6 @@
SocketDescriptor* descriptor = nullptr;
};
SocketDestination out_socket_;
-
- DISALLOW_COPY_AND_ASSIGN(UnixDomainServerSocket);
};
} // namespace net
diff --git a/net/socket/websocket_endpoint_lock_manager.h b/net/socket/websocket_endpoint_lock_manager.h
index cdd8e03..a0e7607 100644
--- a/net/socket/websocket_endpoint_lock_manager.h
+++ b/net/socket/websocket_endpoint_lock_manager.h
@@ -50,6 +50,10 @@
public:
LockReleaser(WebSocketEndpointLockManager* websocket_endpoint_lock_manager,
IPEndPoint endpoint);
+
+ LockReleaser(const LockReleaser&) = delete;
+ LockReleaser& operator=(const LockReleaser&) = delete;
+
~LockReleaser();
private:
@@ -59,8 +63,6 @@
// destroyed.
WebSocketEndpointLockManager* websocket_endpoint_lock_manager_;
const IPEndPoint endpoint_;
-
- DISALLOW_COPY_AND_ASSIGN(LockReleaser);
};
WebSocketEndpointLockManager();
diff --git a/net/socket/websocket_transport_client_socket_pool.h b/net/socket/websocket_transport_client_socket_pool.h
index a0e8628..ac09b01a 100644
--- a/net/socket/websocket_transport_client_socket_pool.h
+++ b/net/socket/websocket_transport_client_socket_pool.h
@@ -39,6 +39,11 @@
const ProxyServer& proxy_server,
const CommonConnectJobParams* common_connect_job_params);
+ WebSocketTransportClientSocketPool(
+ const WebSocketTransportClientSocketPool&) = delete;
+ WebSocketTransportClientSocketPool& operator=(
+ const WebSocketTransportClientSocketPool&) = delete;
+
~WebSocketTransportClientSocketPool() override;
// Allow another connection to be started to the IPEndPoint that this |handle|
@@ -100,6 +105,10 @@
CompletionOnceCallback callback,
ClientSocketHandle* socket_handle,
const NetLogWithSource& request_net_log);
+
+ ConnectJobDelegate(const ConnectJobDelegate&) = delete;
+ ConnectJobDelegate& operator=(const ConnectJobDelegate&) = delete;
+
~ConnectJobDelegate() override;
// ConnectJob::Delegate implementation
@@ -127,8 +136,6 @@
std::unique_ptr<ConnectJob> connect_job_;
ClientSocketHandle* const socket_handle_;
const NetLogWithSource request_net_log_;
-
- DISALLOW_COPY_AND_ASSIGN(ConnectJobDelegate);
};
// Store the arguments from a call to RequestSocket() that has stalled so we
@@ -200,8 +207,6 @@
bool flushing_;
base::WeakPtrFactory<WebSocketTransportClientSocketPool> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketTransportClientSocketPool);
};
} // namespace net
diff --git a/net/socket/websocket_transport_connect_job.h b/net/socket/websocket_transport_connect_job.h
index ab739039..0bb6aa8 100644
--- a/net/socket/websocket_transport_connect_job.h
+++ b/net/socket/websocket_transport_connect_job.h
@@ -59,6 +59,11 @@
const scoped_refptr<TransportSocketParams>& params,
Delegate* delegate,
const NetLogWithSource* net_log);
+
+ WebSocketTransportConnectJob(const WebSocketTransportConnectJob&) = delete;
+ WebSocketTransportConnectJob& operator=(const WebSocketTransportConnectJob&) =
+ delete;
+
~WebSocketTransportConnectJob() override;
// ConnectJob methods.
@@ -123,8 +128,6 @@
ResolveErrorInfo resolve_error_info_;
base::WeakPtrFactory<WebSocketTransportConnectJob> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketTransportConnectJob);
};
} // namespace net
diff --git a/net/socket/websocket_transport_connect_sub_job.cc b/net/socket/websocket_transport_connect_sub_job.cc
index 43bc9061..cfbe9e3 100644
--- a/net/socket/websocket_transport_connect_sub_job.cc
+++ b/net/socket/websocket_transport_connect_sub_job.cc
@@ -31,6 +31,9 @@
: wrapped_socket_(std::move(wrapped_socket)),
lock_releaser_(websocket_endpoint_lock_manager, address) {}
+ WebSocketStreamSocket(const WebSocketStreamSocket&) = delete;
+ WebSocketStreamSocket& operator=(const WebSocketStreamSocket&) = delete;
+
~WebSocketStreamSocket() override = default;
// Socket implementation:
@@ -114,8 +117,6 @@
private:
std::unique_ptr<StreamSocket> wrapped_socket_;
WebSocketEndpointLockManager::LockReleaser lock_releaser_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketStreamSocket);
};
} // namespace
diff --git a/net/socket/websocket_transport_connect_sub_job.h b/net/socket/websocket_transport_connect_sub_job.h
index 23cb529..c7a1141f 100644
--- a/net/socket/websocket_transport_connect_sub_job.h
+++ b/net/socket/websocket_transport_connect_sub_job.h
@@ -40,6 +40,11 @@
SubJobType type,
WebSocketEndpointLockManager* websocket_endpoint_lock_manager);
+ WebSocketTransportConnectSubJob(const WebSocketTransportConnectSubJob&) =
+ delete;
+ WebSocketTransportConnectSubJob& operator=(
+ const WebSocketTransportConnectSubJob&) = delete;
+
~WebSocketTransportConnectSubJob() override;
// Start connecting.
@@ -91,8 +96,6 @@
WebSocketEndpointLockManager* const websocket_endpoint_lock_manager_;
std::unique_ptr<StreamSocket> transport_socket_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketTransportConnectSubJob);
};
} // namespace net
diff --git a/net/spdy/bidirectional_stream_spdy_impl.h b/net/spdy/bidirectional_stream_spdy_impl.h
index 44ff6fd..e4836f1 100644
--- a/net/spdy/bidirectional_stream_spdy_impl.h
+++ b/net/spdy/bidirectional_stream_spdy_impl.h
@@ -40,6 +40,10 @@
BidirectionalStreamSpdyImpl(const base::WeakPtr<SpdySession>& spdy_session,
NetLogSource source_dependency);
+ BidirectionalStreamSpdyImpl(const BidirectionalStreamSpdyImpl&) = delete;
+ BidirectionalStreamSpdyImpl& operator=(const BidirectionalStreamSpdyImpl&) =
+ delete;
+
~BidirectionalStreamSpdyImpl() override;
// BidirectionalStreamImpl implementation:
@@ -130,8 +134,6 @@
scoped_refptr<IOBuffer> pending_combined_buffer_;
base::WeakPtrFactory<BidirectionalStreamSpdyImpl> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(BidirectionalStreamSpdyImpl);
};
} // namespace net
diff --git a/net/spdy/bidirectional_stream_spdy_impl_unittest.cc b/net/spdy/bidirectional_stream_spdy_impl_unittest.cc
index 23d632e..a017f6d 100644
--- a/net/spdy/bidirectional_stream_spdy_impl_unittest.cc
+++ b/net/spdy/bidirectional_stream_spdy_impl_unittest.cc
@@ -87,6 +87,9 @@
not_expect_callback_(false),
on_failed_called_(false) {}
+ TestDelegateBase(const TestDelegateBase&) = delete;
+ TestDelegateBase& operator=(const TestDelegateBase&) = delete;
+
~TestDelegateBase() override = default;
void OnStreamReady(bool request_headers_sent) override {
@@ -234,8 +237,6 @@
bool run_until_completion_;
bool not_expect_callback_;
bool on_failed_called_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDelegateBase);
};
} // namespace
diff --git a/net/spdy/buffered_spdy_framer.h b/net/spdy/buffered_spdy_framer.h
index d1ef516..d9a4d09 100644
--- a/net/spdy/buffered_spdy_framer.h
+++ b/net/spdy/buffered_spdy_framer.h
@@ -133,6 +133,10 @@
const NetLogWithSource& net_log,
TimeFunc time_func = base::TimeTicks::Now);
BufferedSpdyFramer() = delete;
+
+ BufferedSpdyFramer(const BufferedSpdyFramer&) = delete;
+ BufferedSpdyFramer& operator=(const BufferedSpdyFramer&) = delete;
+
~BufferedSpdyFramer() override;
// Sets callbacks to be called from the buffered spdy framer. A visitor must
@@ -279,8 +283,6 @@
const uint32_t max_header_list_size_;
NetLogWithSource net_log_;
TimeFunc time_func_;
-
- DISALLOW_COPY_AND_ASSIGN(BufferedSpdyFramer);
};
} // namespace net
diff --git a/net/spdy/http2_push_promise_index.h b/net/spdy/http2_push_promise_index.h
index f92fc2a..b27115b 100644
--- a/net/spdy/http2_push_promise_index.h
+++ b/net/spdy/http2_push_promise_index.h
@@ -42,6 +42,10 @@
class NET_EXPORT Delegate {
public:
Delegate() {}
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate() {}
// Return true if a pushed stream with |url| can be used for a request with
@@ -54,12 +58,13 @@
// Generate weak pointer. Guaranateed to be called synchronously after
// ValidatePushedStream() is called and returns true.
virtual base::WeakPtr<SpdySession> GetWeakPtrToSession() = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
Http2PushPromiseIndex();
+
+ Http2PushPromiseIndex(const Http2PushPromiseIndex&) = delete;
+ Http2PushPromiseIndex& operator=(const Http2PushPromiseIndex&) = delete;
+
~Http2PushPromiseIndex();
// Tries to register a Delegate with an unclaimed pushed stream for |url|.
@@ -124,8 +129,6 @@
// Delegate can have pushed streams for different URLs, and different
// Delegates can have pushed streams for the same GURL).
std::set<UnclaimedPushedStream, CompareByUrl> unclaimed_pushed_streams_;
-
- DISALLOW_COPY_AND_ASSIGN(Http2PushPromiseIndex);
};
} // namespace net
diff --git a/net/spdy/spdy_buffer.h b/net/spdy/spdy_buffer.h
index 93d8c5c8..cc6b191c 100644
--- a/net/spdy/spdy_buffer.h
+++ b/net/spdy/spdy_buffer.h
@@ -56,6 +56,9 @@
// non-NULL and |size| must be non-zero.
SpdyBuffer(const char* data, size_t size);
+ SpdyBuffer(const SpdyBuffer&) = delete;
+ SpdyBuffer& operator=(const SpdyBuffer&) = delete;
+
// If there are bytes remaining in the buffer, triggers a call to
// any consume callbacks with a DISCARD source.
~SpdyBuffer();
@@ -99,8 +102,6 @@
const scoped_refptr<SharedFrame> shared_frame_;
std::vector<ConsumeCallback> consume_callbacks_;
size_t offset_;
-
- DISALLOW_COPY_AND_ASSIGN(SpdyBuffer);
};
} // namespace net
diff --git a/net/spdy/spdy_buffer_producer.h b/net/spdy/spdy_buffer_producer.h
index 8d09f7b..8b344e3 100644
--- a/net/spdy/spdy_buffer_producer.h
+++ b/net/spdy/spdy_buffer_producer.h
@@ -25,10 +25,10 @@
// Produces the buffer to be written. Will be called at most once.
virtual std::unique_ptr<SpdyBuffer> ProduceBuffer() = 0;
- virtual ~SpdyBufferProducer();
+ SpdyBufferProducer(const SpdyBufferProducer&) = delete;
+ SpdyBufferProducer& operator=(const SpdyBufferProducer&) = delete;
- private:
- DISALLOW_COPY_AND_ASSIGN(SpdyBufferProducer);
+ virtual ~SpdyBufferProducer();
};
// A simple wrapper around a single SpdyBuffer.
@@ -36,14 +36,15 @@
public:
explicit SimpleBufferProducer(std::unique_ptr<SpdyBuffer> buffer);
+ SimpleBufferProducer(const SimpleBufferProducer&) = delete;
+ SimpleBufferProducer& operator=(const SimpleBufferProducer&) = delete;
+
~SimpleBufferProducer() override;
std::unique_ptr<SpdyBuffer> ProduceBuffer() override;
private:
std::unique_ptr<SpdyBuffer> buffer_;
-
- DISALLOW_COPY_AND_ASSIGN(SimpleBufferProducer);
};
} // namespace net
diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h
index ccfab26..6c5c63bd 100644
--- a/net/spdy/spdy_http_stream.h
+++ b/net/spdy/spdy_http_stream.h
@@ -42,6 +42,10 @@
spdy::SpdyStreamId pushed_stream_id,
NetLogSource source_dependency,
std::vector<std::string> dns_aliases);
+
+ SpdyHttpStream(const SpdyHttpStream&) = delete;
+ SpdyHttpStream& operator=(const SpdyHttpStream&) = delete;
+
~SpdyHttpStream() override;
SpdyStream* stream() { return stream_; }
@@ -225,8 +229,6 @@
std::vector<std::string> dns_aliases_;
base::WeakPtrFactory<SpdyHttpStream> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpdyHttpStream);
};
} // namespace net
diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h
index ca0e3c5..096b384 100644
--- a/net/spdy/spdy_proxy_client_socket.h
+++ b/net/spdy/spdy_proxy_client_socket.h
@@ -54,6 +54,9 @@
HttpAuthController* auth_controller,
ProxyDelegate* proxy_delegate);
+ SpdyProxyClientSocket(const SpdyProxyClientSocket&) = delete;
+ SpdyProxyClientSocket& operator=(const SpdyProxyClientSocket&) = delete;
+
// On destruction Disconnect() is called.
~SpdyProxyClientSocket() override;
@@ -190,8 +193,6 @@
// factory are invalidated in Disconnect().
base::WeakPtrFactory<SpdyProxyClientSocket> write_callback_weak_factory_{
this};
-
- DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocket);
};
} // namespace net
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 96690a0a..ebc34b5 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -129,6 +129,11 @@
public ::testing::WithParamInterface<bool> {
public:
SpdyProxyClientSocketTest();
+
+ SpdyProxyClientSocketTest(const SpdyProxyClientSocketTest&) = delete;
+ SpdyProxyClientSocketTest& operator=(const SpdyProxyClientSocketTest&) =
+ delete;
+
~SpdyProxyClientSocketTest() override;
void TearDown() override;
@@ -204,8 +209,6 @@
SpdySessionKey endpoint_spdy_session_key_;
std::unique_ptr<CommonConnectJobParams> common_connect_job_params_;
SSLSocketDataProvider ssl_;
-
- DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocketTest);
};
SpdyProxyClientSocketTest::SpdyProxyClientSocketTest()
@@ -1465,6 +1468,9 @@
explicit DeleteSockCallback(std::unique_ptr<SpdyProxyClientSocket>* sock)
: sock_(sock) {}
+ DeleteSockCallback(const DeleteSockCallback&) = delete;
+ DeleteSockCallback& operator=(const DeleteSockCallback&) = delete;
+
~DeleteSockCallback() override = default;
CompletionOnceCallback callback() {
@@ -1479,8 +1485,6 @@
}
std::unique_ptr<SpdyProxyClientSocket>* sock_;
-
- DISALLOW_COPY_AND_ASSIGN(DeleteSockCallback);
};
// If the socket is Reset when both a read and write are pending, and the
diff --git a/net/spdy/spdy_read_queue.h b/net/spdy/spdy_read_queue.h
index 73f1c67..a50a16d5 100644
--- a/net/spdy/spdy_read_queue.h
+++ b/net/spdy/spdy_read_queue.h
@@ -21,6 +21,10 @@
class NET_EXPORT_PRIVATE SpdyReadQueue {
public:
SpdyReadQueue();
+
+ SpdyReadQueue(const SpdyReadQueue&) = delete;
+ SpdyReadQueue& operator=(const SpdyReadQueue&) = delete;
+
~SpdyReadQueue();
// Returns whether there's anything in the queue.
@@ -44,8 +48,6 @@
// |total_size_| is the sum of GetRemainingSize() of |queue_|'s elements.
base::circular_deque<std::unique_ptr<SpdyBuffer>> queue_;
size_t total_size_;
-
- DISALLOW_COPY_AND_ASSIGN(SpdyReadQueue);
};
} // namespace net
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 0b087604..3bdcd84 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -224,6 +224,10 @@
class NET_EXPORT_PRIVATE SpdyStreamRequest {
public:
SpdyStreamRequest();
+
+ SpdyStreamRequest(const SpdyStreamRequest&) = delete;
+ SpdyStreamRequest& operator=(const SpdyStreamRequest&) = delete;
+
// Calls CancelRequest().
~SpdyStreamRequest();
@@ -310,8 +314,6 @@
base::TimeTicks confirm_handshake_end_;
base::WeakPtrFactory<SpdyStreamRequest> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SpdyStreamRequest);
};
class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
index 15956d1..f645186 100644
--- a/net/spdy/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.h
@@ -79,14 +79,15 @@
class NET_EXPORT_PRIVATE Delegate {
public:
Delegate();
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate();
// |spdy_session| will not be null.
virtual void OnSpdySessionAvailable(
base::WeakPtr<SpdySession> spdy_session) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
// Constructor - this is called by the SpdySessionPool.
@@ -97,6 +98,9 @@
Delegate* delegate,
SpdySessionPool* spdy_session_pool);
+ SpdySessionRequest(const SpdySessionRequest&) = delete;
+ SpdySessionRequest& operator=(const SpdySessionRequest&) = delete;
+
~SpdySessionRequest();
// Called by SpdySessionPool to signal that the request has been removed
@@ -122,8 +126,6 @@
const bool is_blocking_request_for_session_;
Delegate* const delegate_;
SpdySessionPool* spdy_session_pool_;
-
- DISALLOW_COPY_AND_ASSIGN(SpdySessionRequest);
};
SpdySessionPool(HostResolver* host_resolver,
diff --git a/net/spdy/spdy_session_pool_unittest.cc b/net/spdy/spdy_session_pool_unittest.cc
index 4d87baf6..0704524 100644
--- a/net/spdy/spdy_session_pool_unittest.cc
+++ b/net/spdy/spdy_session_pool_unittest.cc
@@ -96,6 +96,11 @@
: public SpdySessionPool::SpdySessionRequest::Delegate {
public:
SpdySessionRequestDelegate() = default;
+
+ SpdySessionRequestDelegate(const SpdySessionRequestDelegate&) = delete;
+ SpdySessionRequestDelegate& operator=(const SpdySessionRequestDelegate&) =
+ delete;
+
~SpdySessionRequestDelegate() override = default;
void OnSpdySessionAvailable(
@@ -112,8 +117,6 @@
private:
bool callback_invoked_ = false;
base::WeakPtr<SpdySession> spdy_session_;
-
- DISALLOW_COPY_AND_ASSIGN(SpdySessionRequestDelegate);
};
// Attempts to set up an alias for |key| using an already existing session in
@@ -1194,6 +1197,11 @@
class TestOnRequestDeletedCallback {
public:
TestOnRequestDeletedCallback() = default;
+
+ TestOnRequestDeletedCallback(const TestOnRequestDeletedCallback&) = delete;
+ TestOnRequestDeletedCallback& operator=(const TestOnRequestDeletedCallback&) =
+ delete;
+
~TestOnRequestDeletedCallback() = default;
base::RepeatingClosure Callback() {
@@ -1223,22 +1231,21 @@
base::RunLoop run_loop_;
base::OnceClosure request_deleted_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(TestOnRequestDeletedCallback);
};
class TestRequestDelegate
: public SpdySessionPool::SpdySessionRequest::Delegate {
public:
TestRequestDelegate() = default;
+
+ TestRequestDelegate(const TestRequestDelegate&) = delete;
+ TestRequestDelegate& operator=(const TestRequestDelegate&) = delete;
+
~TestRequestDelegate() override = default;
// SpdySessionPool::SpdySessionRequest::Delegate implementation:
void OnSpdySessionAvailable(
base::WeakPtr<SpdySession> spdy_session) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestRequestDelegate);
};
TEST_F(SpdySessionPoolTest, RequestSessionWithNoSessions) {
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index df02402..8a1113c 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -113,13 +113,15 @@
: public SpdySessionPool::SpdySessionRequest::Delegate {
public:
SpdySessionRequestDelegate() = default;
+
+ SpdySessionRequestDelegate(const SpdySessionRequestDelegate&) = delete;
+ SpdySessionRequestDelegate& operator=(const SpdySessionRequestDelegate&) =
+ delete;
+
~SpdySessionRequestDelegate() override = default;
void OnSpdySessionAvailable(
base::WeakPtr<SpdySession> spdy_session) override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(SpdySessionRequestDelegate);
};
} // namespace
diff --git a/net/spdy/spdy_write_queue.h b/net/spdy/spdy_write_queue.h
index a39ab4a..b7d39e6 100644
--- a/net/spdy/spdy_write_queue.h
+++ b/net/spdy/spdy_write_queue.h
@@ -30,6 +30,10 @@
class NET_EXPORT_PRIVATE SpdyWriteQueue {
public:
SpdyWriteQueue();
+
+ SpdyWriteQueue(const SpdyWriteQueue&) = delete;
+ SpdyWriteQueue& operator=(const SpdyWriteQueue&) = delete;
+
~SpdyWriteQueue();
// Returns whether there is anything in the write queue,
@@ -108,8 +112,6 @@
// The actual write queue, binned by priority.
base::circular_deque<PendingWrite> queue_[NUM_PRIORITIES];
-
- DISALLOW_COPY_AND_ASSIGN(SpdyWriteQueue);
};
} // namespace net
diff --git a/net/ssl/client_cert_store.h b/net/ssl/client_cert_store.h
index b0c1c65..e6a3f07 100644
--- a/net/ssl/client_cert_store.h
+++ b/net/ssl/client_cert_store.h
@@ -21,6 +21,9 @@
// gets its own uniquely owned handle.
class NET_EXPORT ClientCertStore {
public:
+ ClientCertStore(const ClientCertStore&) = delete;
+ ClientCertStore& operator=(const ClientCertStore&) = delete;
+
virtual ~ClientCertStore() {}
using ClientCertListCallback =
@@ -35,9 +38,6 @@
protected:
ClientCertStore() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ClientCertStore);
};
} // namespace net
diff --git a/net/ssl/client_cert_store_mac.h b/net/ssl/client_cert_store_mac.h
index 7dc3b4c..288be6a 100644
--- a/net/ssl/client_cert_store_mac.h
+++ b/net/ssl/client_cert_store_mac.h
@@ -16,6 +16,10 @@
class NET_EXPORT ClientCertStoreMac : public ClientCertStore {
public:
ClientCertStoreMac();
+
+ ClientCertStoreMac(const ClientCertStoreMac&) = delete;
+ ClientCertStoreMac& operator=(const ClientCertStoreMac&) = delete;
+
~ClientCertStoreMac() override;
// ClientCertStore:
@@ -44,8 +48,6 @@
ClientCertIdentityList regular_identities,
const SSLCertRequestInfo& request,
ClientCertIdentityList* selected_identities);
-
- DISALLOW_COPY_AND_ASSIGN(ClientCertStoreMac);
};
} // namespace net
diff --git a/net/ssl/client_cert_store_nss.h b/net/ssl/client_cert_store_nss.h
index 95313553..046a6e4 100644
--- a/net/ssl/client_cert_store_nss.h
+++ b/net/ssl/client_cert_store_nss.h
@@ -31,6 +31,10 @@
explicit ClientCertStoreNSS(
const PasswordDelegateFactory& password_delegate_factory);
+
+ ClientCertStoreNSS(const ClientCertStoreNSS&) = delete;
+ ClientCertStoreNSS& operator=(const ClientCertStoreNSS&) = delete;
+
~ClientCertStoreNSS() override;
// ClientCertStore:
@@ -64,8 +68,6 @@
// The factory for creating the delegate for requesting a password to a
// PKCS#11 token. May be null.
PasswordDelegateFactory password_delegate_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(ClientCertStoreNSS);
};
} // namespace net
diff --git a/net/ssl/client_cert_store_win.h b/net/ssl/client_cert_store_win.h
index 6dac938..2c09ba5 100644
--- a/net/ssl/client_cert_store_win.h
+++ b/net/ssl/client_cert_store_win.h
@@ -25,6 +25,9 @@
explicit ClientCertStoreWin(
base::RepeatingCallback<crypto::ScopedHCERTSTORE()> cert_store_callback);
+ ClientCertStoreWin(const ClientCertStoreWin&) = delete;
+ ClientCertStoreWin& operator=(const ClientCertStoreWin&) = delete;
+
~ClientCertStoreWin() override;
// If a cert store has been provided at construction time GetClientCerts
@@ -51,8 +54,6 @@
ClientCertIdentityList* selected_identities);
base::RepeatingCallback<crypto::ScopedHCERTSTORE()> cert_store_callback_;
-
- DISALLOW_COPY_AND_ASSIGN(ClientCertStoreWin);
};
} // namespace net
diff --git a/net/ssl/ssl_client_session_cache.h b/net/ssl/ssl_client_session_cache.h
index 787891af..9cccdfd 100644
--- a/net/ssl/ssl_client_session_cache.h
+++ b/net/ssl/ssl_client_session_cache.h
@@ -57,6 +57,10 @@
};
explicit SSLClientSessionCache(const Config& config);
+
+ SSLClientSessionCache(const SSLClientSessionCache&) = delete;
+ SSLClientSessionCache& operator=(const SSLClientSessionCache&) = delete;
+
~SSLClientSessionCache();
// Returns true if |entry| is expired as of |now|.
@@ -119,8 +123,6 @@
base::MRUCache<Key, Entry> cache_;
size_t lookups_since_flush_;
std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLClientSessionCache);
};
} // namespace net
diff --git a/net/ssl/ssl_config_service_defaults.h b/net/ssl/ssl_config_service_defaults.h
index ab5bb4b..273a51d 100644
--- a/net/ssl/ssl_config_service_defaults.h
+++ b/net/ssl/ssl_config_service_defaults.h
@@ -17,6 +17,10 @@
class NET_EXPORT SSLConfigServiceDefaults : public SSLConfigService {
public:
SSLConfigServiceDefaults();
+
+ SSLConfigServiceDefaults(const SSLConfigServiceDefaults&) = delete;
+ SSLConfigServiceDefaults& operator=(const SSLConfigServiceDefaults&) = delete;
+
~SSLConfigServiceDefaults() override;
// Returns the default SSL config settings.
@@ -28,8 +32,6 @@
private:
// Default value of prefs.
const SSLContextConfig default_config_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLConfigServiceDefaults);
};
} // namespace net
diff --git a/net/ssl/ssl_key_logger_impl.h b/net/ssl/ssl_key_logger_impl.h
index 87f1a6b..85167d6a 100644
--- a/net/ssl/ssl_key_logger_impl.h
+++ b/net/ssl/ssl_key_logger_impl.h
@@ -32,6 +32,9 @@
// operations in the background.
explicit SSLKeyLoggerImpl(base::File file);
+ SSLKeyLoggerImpl(const SSLKeyLoggerImpl&) = delete;
+ SSLKeyLoggerImpl& operator=(const SSLKeyLoggerImpl&) = delete;
+
~SSLKeyLoggerImpl() override;
void WriteLine(const std::string& line) override;
@@ -39,8 +42,6 @@
private:
class Core;
scoped_refptr<Core> core_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLKeyLoggerImpl);
};
} // namespace net
diff --git a/net/ssl/ssl_platform_key_android.cc b/net/ssl/ssl_platform_key_android.cc
index 21baf77..079e283 100644
--- a/net/ssl/ssl_platform_key_android.cc
+++ b/net/ssl/ssl_platform_key_android.cc
@@ -95,6 +95,9 @@
}
}
+ SSLPlatformKeyAndroid(const SSLPlatformKeyAndroid&) = delete;
+ SSLPlatformKeyAndroid& operator=(const SSLPlatformKeyAndroid&) = delete;
+
~SSLPlatformKeyAndroid() override {}
std::string GetProviderName() override { return provider_name_; }
@@ -177,8 +180,6 @@
std::string provider_name_;
std::vector<uint16_t> preferences_;
base::flat_set<uint16_t> use_pss_fallback_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyAndroid);
};
} // namespace
diff --git a/net/ssl/ssl_platform_key_mac.cc b/net/ssl/ssl_platform_key_mac.cc
index 4887c14..c14c550 100644
--- a/net/ssl/ssl_platform_key_mac.cc
+++ b/net/ssl/ssl_platform_key_mac.cc
@@ -56,6 +56,9 @@
ScopedCSSM_CC_HANDLE() : handle_(0) {}
explicit ScopedCSSM_CC_HANDLE(CSSM_CC_HANDLE handle) : handle_(handle) {}
+ ScopedCSSM_CC_HANDLE(const ScopedCSSM_CC_HANDLE&) = delete;
+ ScopedCSSM_CC_HANDLE& operator=(const ScopedCSSM_CC_HANDLE&) = delete;
+
~ScopedCSSM_CC_HANDLE() { reset(); }
CSSM_CC_HANDLE get() const { return handle_; }
@@ -68,8 +71,6 @@
private:
CSSM_CC_HANDLE handle_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedCSSM_CC_HANDLE);
};
class SSLPlatformKeyCSSM : public ThreadedSSLPrivateKey::Delegate {
@@ -81,6 +82,9 @@
key_(key, base::scoped_policy::RETAIN),
cssm_key_(cssm_key) {}
+ SSLPlatformKeyCSSM(const SSLPlatformKeyCSSM&) = delete;
+ SSLPlatformKeyCSSM& operator=(const SSLPlatformKeyCSSM&) = delete;
+
~SSLPlatformKeyCSSM() override {}
std::string GetProviderName() override {
@@ -195,8 +199,6 @@
bssl::UniquePtr<EVP_PKEY> pubkey_;
base::ScopedCFTypeRef<SecKeyRef> key_;
const CSSM_KEY* cssm_key_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyCSSM);
};
// Returns the corresponding SecKeyAlgorithm or nullptr if unrecognized.
@@ -254,6 +256,9 @@
}
}
+ SSLPlatformKeySecKey(const SSLPlatformKeySecKey&) = delete;
+ SSLPlatformKeySecKey& operator=(const SSLPlatformKeySecKey&) = delete;
+
~SSLPlatformKeySecKey() override {}
std::string GetProviderName() override {
@@ -344,8 +349,6 @@
std::vector<uint16_t> preferences_;
bssl::UniquePtr<EVP_PKEY> pubkey_;
base::ScopedCFTypeRef<SecKeyRef> key_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeySecKey);
};
scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey(
diff --git a/net/ssl/ssl_platform_key_nss.cc b/net/ssl/ssl_platform_key_nss.cc
index 2f720ff..637f01f 100644
--- a/net/ssl/ssl_platform_key_nss.cc
+++ b/net/ssl/ssl_platform_key_nss.cc
@@ -56,6 +56,10 @@
password_delegate_(std::move(password_delegate)),
key_(std::move(key)),
supports_pss_(PK11_DoesMechanism(key_->pkcs11Slot, CKM_RSA_PKCS_PSS)) {}
+
+ SSLPlatformKeyNSS(const SSLPlatformKeyNSS&) = delete;
+ SSLPlatformKeyNSS& operator=(const SSLPlatformKeyNSS&) = delete;
+
~SSLPlatformKeyNSS() override = default;
std::string GetProviderName() override {
@@ -183,8 +187,6 @@
password_delegate_;
crypto::ScopedSECKEYPrivateKey key_;
bool supports_pss_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyNSS);
};
} // namespace
diff --git a/net/ssl/ssl_platform_key_util.cc b/net/ssl/ssl_platform_key_util.cc
index 2d1a8c3a..7d9d498 100644
--- a/net/ssl/ssl_platform_key_util.cc
+++ b/net/ssl/ssl_platform_key_util.cc
@@ -30,6 +30,9 @@
worker_thread_.StartWithOptions(std::move(options));
}
+ SSLPlatformKeyTaskRunner(const SSLPlatformKeyTaskRunner&) = delete;
+ SSLPlatformKeyTaskRunner& operator=(const SSLPlatformKeyTaskRunner&) = delete;
+
~SSLPlatformKeyTaskRunner() = default;
scoped_refptr<base::SingleThreadTaskRunner> task_runner() {
@@ -38,8 +41,6 @@
private:
base::Thread worker_thread_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyTaskRunner);
};
base::LazyInstance<SSLPlatformKeyTaskRunner>::Leaky g_platform_key_task_runner =
diff --git a/net/ssl/ssl_platform_key_win.cc b/net/ssl/ssl_platform_key_win.cc
index 64b43e6..e33e448 100644
--- a/net/ssl/ssl_platform_key_win.cc
+++ b/net/ssl/ssl_platform_key_win.cc
@@ -55,6 +55,9 @@
provider_(std::move(provider)),
key_spec_(key_spec) {}
+ SSLPlatformKeyCAPI(const SSLPlatformKeyCAPI&) = delete;
+ SSLPlatformKeyCAPI& operator=(const SSLPlatformKeyCAPI&) = delete;
+
~SSLPlatformKeyCAPI() override = default;
std::string GetProviderName() override { return "CAPI: " + provider_name_; }
@@ -149,8 +152,6 @@
std::string provider_name_;
crypto::ScopedHCRYPTPROV provider_;
DWORD key_spec_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyCAPI);
};
class ScopedNCRYPT_PROV_HANDLE {
@@ -220,6 +221,9 @@
type_(type),
max_length_(max_length) {}
+ SSLPlatformKeyCNG(const SSLPlatformKeyCNG&) = delete;
+ SSLPlatformKeyCNG& operator=(const SSLPlatformKeyCNG&) = delete;
+
~SSLPlatformKeyCNG() override { NCryptFreeObject(key_); }
std::string GetProviderName() override {
@@ -375,8 +379,6 @@
NCRYPT_KEY_HANDLE key_;
int type_;
size_t max_length_;
-
- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyCNG);
};
} // namespace
diff --git a/net/ssl/test_ssl_private_key.cc b/net/ssl/test_ssl_private_key.cc
index 98c8e3f..336c13b 100644
--- a/net/ssl/test_ssl_private_key.cc
+++ b/net/ssl/test_ssl_private_key.cc
@@ -28,6 +28,9 @@
explicit TestSSLPlatformKey(bssl::UniquePtr<EVP_PKEY> key)
: key_(std::move(key)) {}
+ TestSSLPlatformKey(const TestSSLPlatformKey&) = delete;
+ TestSSLPlatformKey& operator=(const TestSSLPlatformKey&) = delete;
+
~TestSSLPlatformKey() override = default;
std::string GetProviderName() override { return "EVP_PKEY"; }
@@ -68,13 +71,15 @@
private:
bssl::UniquePtr<EVP_PKEY> key_;
-
- DISALLOW_COPY_AND_ASSIGN(TestSSLPlatformKey);
};
class FailingSSLPlatformKey : public ThreadedSSLPrivateKey::Delegate {
public:
FailingSSLPlatformKey() = default;
+
+ FailingSSLPlatformKey(const FailingSSLPlatformKey&) = delete;
+ FailingSSLPlatformKey& operator=(const FailingSSLPlatformKey&) = delete;
+
~FailingSSLPlatformKey() override = default;
std::string GetProviderName() override { return "FailingSSLPlatformKey"; }
@@ -89,9 +94,6 @@
std::vector<uint8_t>* signature) override {
return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(FailingSSLPlatformKey);
};
} // namespace
diff --git a/net/ssl/threaded_ssl_private_key.h b/net/ssl/threaded_ssl_private_key.h
index a769331..4bfa5d63 100644
--- a/net/ssl/threaded_ssl_private_key.h
+++ b/net/ssl/threaded_ssl_private_key.h
@@ -33,6 +33,10 @@
class Delegate {
public:
Delegate() {}
+
+ Delegate(const Delegate&) = delete;
+ Delegate& operator=(const Delegate&) = delete;
+
virtual ~Delegate() {}
// Returns a human-readable name of the provider that backs this
@@ -60,9 +64,6 @@
virtual Error Sign(uint16_t algorithm,
base::span<const uint8_t> input,
std::vector<uint8_t>* signature) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(Delegate);
};
ThreadedSSLPrivateKey(
diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.h b/net/test/embedded_test_server/android/embedded_test_server_android.h
index b5d657db..2dbece3 100644
--- a/net/test/embedded_test_server/android/embedded_test_server_android.h
+++ b/net/test/embedded_test_server/android/embedded_test_server_android.h
@@ -24,6 +24,11 @@
EmbeddedTestServerAndroid(JNIEnv* env,
const base::android::JavaRef<jobject>& obj,
jboolean jhttps);
+
+ EmbeddedTestServerAndroid(const EmbeddedTestServerAndroid&) = delete;
+ EmbeddedTestServerAndroid& operator=(const EmbeddedTestServerAndroid&) =
+ delete;
+
~EmbeddedTestServerAndroid();
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
@@ -94,8 +99,6 @@
EmbeddedTestServer test_server_;
ConnectionListener connection_listener_;
-
- DISALLOW_COPY_AND_ASSIGN(EmbeddedTestServerAndroid);
};
} // namespace test_server
diff --git a/net/test/embedded_test_server/controllable_http_response.cc b/net/test/embedded_test_server/controllable_http_response.cc
index a3fd4996..7541b2c 100644
--- a/net/test/embedded_test_server/controllable_http_response.cc
+++ b/net/test/embedded_test_server/controllable_http_response.cc
@@ -22,6 +22,10 @@
: controller_(controller),
controller_task_runner_(controller_task_runner),
http_request_(std::make_unique<HttpRequest>(http_request)) {}
+
+ Interceptor(const Interceptor&) = delete;
+ Interceptor& operator=(const Interceptor&) = delete;
+
~Interceptor() override {}
private:
@@ -38,8 +42,6 @@
scoped_refptr<base::SingleThreadTaskRunner> controller_task_runner_;
std::unique_ptr<HttpRequest> http_request_;
-
- DISALLOW_COPY_AND_ASSIGN(Interceptor);
};
ControllableHttpResponse::ControllableHttpResponse(
diff --git a/net/test/embedded_test_server/controllable_http_response.h b/net/test/embedded_test_server/controllable_http_response.h
index c04da5cf..9e8cb0d 100644
--- a/net/test/embedded_test_server/controllable_http_response.h
+++ b/net/test/embedded_test_server/controllable_http_response.h
@@ -38,6 +38,10 @@
ControllableHttpResponse(EmbeddedTestServer* embedded_test_server,
const std::string& relative_url,
bool relative_url_is_prefix = false);
+
+ ControllableHttpResponse(const ControllableHttpResponse&) = delete;
+ ControllableHttpResponse& operator=(const ControllableHttpResponse&) = delete;
+
~ControllableHttpResponse();
// These method are intented to be used in order.
@@ -89,8 +93,6 @@
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<ControllableHttpResponse> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(ControllableHttpResponse);
};
} // namespace test_server
diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc
index e572f629..91edebf 100644
--- a/net/test/embedded_test_server/embedded_test_server_unittest.cc
+++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
@@ -55,6 +55,9 @@
did_get_socket_on_complete_(false),
task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
+ TestConnectionListener(const TestConnectionListener&) = delete;
+ TestConnectionListener& operator=(const TestConnectionListener&) = delete;
+
~TestConnectionListener() override = default;
// Get called from the EmbeddedTestServer thread to be notified that
@@ -110,8 +113,6 @@
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
mutable base::Lock lock_;
-
- DISALLOW_COPY_AND_ASSIGN(TestConnectionListener);
};
class EmbeddedTestServerTest
@@ -430,6 +431,10 @@
class CancelRequestDelegate : public TestDelegate {
public:
CancelRequestDelegate() { set_on_complete(base::DoNothing()); }
+
+ CancelRequestDelegate(const CancelRequestDelegate&) = delete;
+ CancelRequestDelegate& operator=(const CancelRequestDelegate&) = delete;
+
~CancelRequestDelegate() override = default;
void OnResponseStarted(URLRequest* request, int net_error) override {
@@ -442,8 +447,6 @@
private:
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(CancelRequestDelegate);
};
class InfiniteResponse : public BasicHttpResponse {
diff --git a/net/test/embedded_test_server/http_request.h b/net/test/embedded_test_server/http_request.h
index 65b37bb..35a1177 100644
--- a/net/test/embedded_test_server/http_request.h
+++ b/net/test/embedded_test_server/http_request.h
@@ -95,6 +95,10 @@
};
HttpRequestParser();
+
+ HttpRequestParser(const HttpRequestParser&) = delete;
+ HttpRequestParser& operator=(const HttpRequestParser&) = delete;
+
~HttpRequestParser();
// Adds chunk of data into the internal buffer.
@@ -135,8 +139,6 @@
size_t declared_content_length_;
std::unique_ptr<HttpChunkedDecoder> chunked_decoder_;
-
- DISALLOW_COPY_AND_ASSIGN(HttpRequestParser);
};
} // namespace test_server
diff --git a/net/test/embedded_test_server/http_response.h b/net/test/embedded_test_server/http_response.h
index d8a8a28..64b704a 100644
--- a/net/test/embedded_test_server/http_response.h
+++ b/net/test/embedded_test_server/http_response.h
@@ -44,6 +44,10 @@
class BasicHttpResponse : public HttpResponse {
public:
BasicHttpResponse();
+
+ BasicHttpResponse(const BasicHttpResponse&) = delete;
+ BasicHttpResponse& operator=(const BasicHttpResponse&) = delete;
+
~BasicHttpResponse() override;
// The response code.
@@ -76,13 +80,15 @@
std::string content_;
std::string content_type_;
base::StringPairs custom_headers_;
-
- DISALLOW_COPY_AND_ASSIGN(BasicHttpResponse);
};
class DelayedHttpResponse : public BasicHttpResponse {
public:
DelayedHttpResponse(const base::TimeDelta delay);
+
+ DelayedHttpResponse(const DelayedHttpResponse&) = delete;
+ DelayedHttpResponse& operator=(const DelayedHttpResponse&) = delete;
+
~DelayedHttpResponse() override;
// Issues a delayed send to the to the task runner.
@@ -92,13 +98,15 @@
private:
// The delay time for the response.
const base::TimeDelta delay_;
-
- DISALLOW_COPY_AND_ASSIGN(DelayedHttpResponse);
};
class RawHttpResponse : public HttpResponse {
public:
RawHttpResponse(const std::string& headers, const std::string& contents);
+
+ RawHttpResponse(const RawHttpResponse&) = delete;
+ RawHttpResponse& operator=(const RawHttpResponse&) = delete;
+
~RawHttpResponse() override;
void SendResponse(const SendBytesCallback& send,
@@ -109,8 +117,6 @@
private:
std::string headers_;
const std::string contents_;
-
- DISALLOW_COPY_AND_ASSIGN(RawHttpResponse);
};
// "Response" where the server doesn't actually respond until the server is
@@ -118,13 +124,14 @@
class HungResponse : public HttpResponse {
public:
HungResponse() {}
+
+ HungResponse(const HungResponse&) = delete;
+ HungResponse& operator=(const HungResponse&) = delete;
+
~HungResponse() override {}
void SendResponse(const SendBytesCallback& send,
SendCompleteCallback done) override;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(HungResponse);
};
} // namespace test_server
diff --git a/net/test/embedded_test_server/simple_connection_listener.h b/net/test/embedded_test_server/simple_connection_listener.h
index ac3324589..d3eb785d 100644
--- a/net/test/embedded_test_server/simple_connection_listener.h
+++ b/net/test/embedded_test_server/simple_connection_listener.h
@@ -33,6 +33,9 @@
int expected_connections,
AllowAdditionalConnections allow_additional_connections);
+ SimpleConnectionListener(const SimpleConnectionListener&) = delete;
+ SimpleConnectionListener& operator=(const SimpleConnectionListener&) = delete;
+
// Must be torn down only after the EmbeddedTestServer it's attached to is
// shut down.
~SimpleConnectionListener() override;
@@ -53,8 +56,6 @@
const AllowAdditionalConnections allow_additional_connections_;
base::RunLoop run_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(SimpleConnectionListener);
};
} // namespace test_server
diff --git a/net/test/scoped_disable_exit_on_dfatal.h b/net/test/scoped_disable_exit_on_dfatal.h
index 5bb7643..47866752 100644
--- a/net/test/scoped_disable_exit_on_dfatal.h
+++ b/net/test/scoped_disable_exit_on_dfatal.h
@@ -20,6 +20,11 @@
class ScopedDisableExitOnDFatal {
public:
ScopedDisableExitOnDFatal();
+
+ ScopedDisableExitOnDFatal(const ScopedDisableExitOnDFatal&) = delete;
+ ScopedDisableExitOnDFatal& operator=(const ScopedDisableExitOnDFatal&) =
+ delete;
+
~ScopedDisableExitOnDFatal();
private:
@@ -31,8 +36,6 @@
const base::StringPiece stack_trace);
logging::ScopedLogAssertHandler assert_handler_;
-
- DISALLOW_COPY_AND_ASSIGN(ScopedDisableExitOnDFatal);
};
} // namespace test
diff --git a/net/test/spawned_test_server/local_test_server.h b/net/test/spawned_test_server/local_test_server.h
index b76f90b6..d4594de43 100644
--- a/net/test/spawned_test_server/local_test_server.h
+++ b/net/test/spawned_test_server/local_test_server.h
@@ -39,6 +39,9 @@
const SSLOptions& ssl_options,
const base::FilePath& document_root);
+ LocalTestServer(const LocalTestServer&) = delete;
+ LocalTestServer& operator=(const LocalTestServer&) = delete;
+
~LocalTestServer() override;
// BaseTestServer overrides.
@@ -93,8 +96,6 @@
// The file descriptor the child writes to when it starts.
base::ScopedFD child_fd_;
#endif
-
- DISALLOW_COPY_AND_ASSIGN(LocalTestServer);
};
} // namespace net
diff --git a/net/test/spawned_test_server/remote_test_server.h b/net/test/spawned_test_server/remote_test_server.h
index ca6588923..e37afa0 100644
--- a/net/test/spawned_test_server/remote_test_server.h
+++ b/net/test/spawned_test_server/remote_test_server.h
@@ -74,6 +74,9 @@
const SSLOptions& ssl_options,
const base::FilePath& document_root);
+ RemoteTestServer(const RemoteTestServer&) = delete;
+ RemoteTestServer& operator=(const RemoteTestServer&) = delete;
+
~RemoteTestServer() override;
// BaseTestServer overrides.
@@ -107,8 +110,6 @@
// Server port. Non-zero when the server is running.
int remote_port_ = 0;
-
- DISALLOW_COPY_AND_ASSIGN(RemoteTestServer);
};
} // namespace net
diff --git a/net/test/spawned_test_server/remote_test_server_spawner_request.cc b/net/test/spawned_test_server/remote_test_server_spawner_request.cc
index bbd0433..7fee89d0 100644
--- a/net/test/spawned_test_server/remote_test_server_spawner_request.cc
+++ b/net/test/spawned_test_server/remote_test_server_spawner_request.cc
@@ -32,6 +32,10 @@
class RemoteTestServerSpawnerRequest::Core : public URLRequest::Delegate {
public:
Core();
+
+ Core(const Core&) = delete;
+ Core& operator=(const Core&) = delete;
+
~Core() override;
void SendRequest(const GURL& url, const std::string& post_data);
@@ -62,8 +66,6 @@
scoped_refptr<IOBuffer> read_buffer_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(Core);
};
RemoteTestServerSpawnerRequest::Core::Core()
diff --git a/net/test/spawned_test_server/remote_test_server_spawner_request.h b/net/test/spawned_test_server/remote_test_server_spawner_request.h
index 7abc4f5..bf0a29a 100644
--- a/net/test/spawned_test_server/remote_test_server_spawner_request.h
+++ b/net/test/spawned_test_server/remote_test_server_spawner_request.h
@@ -33,6 +33,12 @@
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
const GURL& url,
const std::string& post_data);
+
+ RemoteTestServerSpawnerRequest(const RemoteTestServerSpawnerRequest&) =
+ delete;
+ RemoteTestServerSpawnerRequest& operator=(
+ const RemoteTestServerSpawnerRequest&) = delete;
+
~RemoteTestServerSpawnerRequest();
// Blocks until request is finished. If |response| isn't nullptr then server
@@ -55,8 +61,6 @@
std::unique_ptr<ScopedPortException> allowed_port_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(RemoteTestServerSpawnerRequest);
};
} // namespace net
diff --git a/net/test/url_request/ssl_certificate_error_job.cc b/net/test/url_request/ssl_certificate_error_job.cc
index ebe76f3..85c7ac6 100644
--- a/net/test/url_request/ssl_certificate_error_job.cc
+++ b/net/test/url_request/ssl_certificate_error_job.cc
@@ -24,6 +24,10 @@
class MockJobInterceptor : public URLRequestInterceptor {
public:
MockJobInterceptor() = default;
+
+ MockJobInterceptor(const MockJobInterceptor&) = delete;
+ MockJobInterceptor& operator=(const MockJobInterceptor&) = delete;
+
~MockJobInterceptor() override = default;
// URLRequestJobFactory::ProtocolHandler implementation:
@@ -31,9 +35,6 @@
URLRequest* request) const override {
return std::make_unique<SSLCertificateErrorJob>(request);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockJobInterceptor);
};
} // namespace
diff --git a/net/test/url_request/ssl_certificate_error_job.h b/net/test/url_request/ssl_certificate_error_job.h
index c3af368..9b02e4d 100644
--- a/net/test/url_request/ssl_certificate_error_job.h
+++ b/net/test/url_request/ssl_certificate_error_job.h
@@ -19,6 +19,9 @@
public:
explicit SSLCertificateErrorJob(URLRequest* request);
+ SSLCertificateErrorJob(const SSLCertificateErrorJob&) = delete;
+ SSLCertificateErrorJob& operator=(const SSLCertificateErrorJob&) = delete;
+
~SSLCertificateErrorJob() override;
// URLRequestJob implementation:
@@ -33,8 +36,6 @@
void NotifyError();
base::WeakPtrFactory<SSLCertificateErrorJob> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(SSLCertificateErrorJob);
};
} // namespace net
diff --git a/net/test/url_request/url_request_failed_job.cc b/net/test/url_request/url_request_failed_job.cc
index d9f77cc..8ef1def5 100644
--- a/net/test/url_request/url_request_failed_job.cc
+++ b/net/test/url_request/url_request_failed_job.cc
@@ -38,6 +38,10 @@
class MockJobInterceptor : public URLRequestInterceptor {
public:
MockJobInterceptor() = default;
+
+ MockJobInterceptor(const MockJobInterceptor&) = delete;
+ MockJobInterceptor& operator=(const MockJobInterceptor&) = delete;
+
~MockJobInterceptor() override = default;
// URLRequestJobFactory::ProtocolHandler implementation:
@@ -58,9 +62,6 @@
}
return std::make_unique<URLRequestFailedJob>(request, phase, net_error);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockJobInterceptor);
};
GURL GetMockUrl(const std::string& scheme,
diff --git a/net/test/url_request/url_request_failed_job.h b/net/test/url_request/url_request_failed_job.h
index 3b14f9c1..fb6fceff0 100644
--- a/net/test/url_request/url_request_failed_job.h
+++ b/net/test/url_request/url_request_failed_job.h
@@ -36,6 +36,9 @@
URLRequestFailedJob(URLRequest* request,
int net_error);
+ URLRequestFailedJob(const URLRequestFailedJob&) = delete;
+ URLRequestFailedJob& operator=(const URLRequestFailedJob&) = delete;
+
~URLRequestFailedJob() override;
// URLRequestJob implementation:
@@ -81,8 +84,6 @@
int64_t total_received_bytes_;
base::WeakPtrFactory<URLRequestFailedJob> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestFailedJob);
};
} // namespace net
diff --git a/net/test/url_request/url_request_hanging_read_job.cc b/net/test/url_request/url_request_hanging_read_job.cc
index 4089df8d..60008a0d 100644
--- a/net/test/url_request/url_request_hanging_read_job.cc
+++ b/net/test/url_request/url_request_hanging_read_job.cc
@@ -28,6 +28,10 @@
class MockJobInterceptor : public URLRequestInterceptor {
public:
MockJobInterceptor() = default;
+
+ MockJobInterceptor(const MockJobInterceptor&) = delete;
+ MockJobInterceptor& operator=(const MockJobInterceptor&) = delete;
+
~MockJobInterceptor() override = default;
// URLRequestInterceptor implementation
@@ -35,9 +39,6 @@
URLRequest* request) const override {
return std::make_unique<URLRequestHangingReadJob>(request);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockJobInterceptor);
};
} // namespace
diff --git a/net/test/url_request/url_request_hanging_read_job.h b/net/test/url_request/url_request_hanging_read_job.h
index d91580d..4448b861 100644
--- a/net/test/url_request/url_request_hanging_read_job.h
+++ b/net/test/url_request/url_request_hanging_read_job.h
@@ -17,6 +17,10 @@
class URLRequestHangingReadJob : public URLRequestJob {
public:
explicit URLRequestHangingReadJob(URLRequest* request);
+
+ URLRequestHangingReadJob(const URLRequestHangingReadJob&) = delete;
+ URLRequestHangingReadJob& operator=(const URLRequestHangingReadJob&) = delete;
+
~URLRequestHangingReadJob() override;
void Start() override;
@@ -36,8 +40,6 @@
const int content_length_;
base::WeakPtrFactory<URLRequestHangingReadJob> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestHangingReadJob);
};
} // namespace net
diff --git a/net/test/url_request/url_request_mock_data_job.cc b/net/test/url_request/url_request_mock_data_job.cc
index aec6c61a..2dfabdb 100644
--- a/net/test/url_request/url_request_mock_data_job.cc
+++ b/net/test/url_request/url_request_mock_data_job.cc
@@ -78,6 +78,10 @@
class MockJobInterceptor : public URLRequestInterceptor {
public:
MockJobInterceptor() = default;
+
+ MockJobInterceptor(const MockJobInterceptor&) = delete;
+ MockJobInterceptor& operator=(const MockJobInterceptor&) = delete;
+
~MockJobInterceptor() override = default;
// URLRequestInterceptor implementation
@@ -88,9 +92,6 @@
GetRepeatCountFromRequest(*request),
GetRequestClientCertificate(*request));
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockJobInterceptor);
};
} // namespace
diff --git a/net/test/url_request/url_request_mock_http_job.cc b/net/test/url_request/url_request_mock_http_job.cc
index 8533009b..dcd9fcfb 100644
--- a/net/test/url_request/url_request_mock_http_job.cc
+++ b/net/test/url_request/url_request_mock_http_job.cc
@@ -38,6 +38,10 @@
bool map_all_requests_to_base_path)
: base_path_(base_path),
map_all_requests_to_base_path_(map_all_requests_to_base_path) {}
+
+ MockJobInterceptor(const MockJobInterceptor&) = delete;
+ MockJobInterceptor& operator=(const MockJobInterceptor&) = delete;
+
~MockJobInterceptor() override = default;
// URLRequestJobFactory::ProtocolHandler implementation
@@ -63,8 +67,6 @@
const base::FilePath base_path_;
const bool map_all_requests_to_base_path_;
-
- DISALLOW_COPY_AND_ASSIGN(MockJobInterceptor);
};
std::string DoFileIO(const base::FilePath& file_path) {
diff --git a/net/test/url_request/url_request_mock_http_job.h b/net/test/url_request/url_request_mock_http_job.h
index 2c053792..b31d86c 100644
--- a/net/test/url_request/url_request_mock_http_job.h
+++ b/net/test/url_request/url_request_mock_http_job.h
@@ -31,6 +31,10 @@
// Note that all file I/O is done using ThreadPool.
URLRequestMockHTTPJob(URLRequest* request,
const base::FilePath& file_path);
+
+ URLRequestMockHTTPJob(const URLRequestMockHTTPJob&) = delete;
+ URLRequestMockHTTPJob& operator=(const URLRequestMockHTTPJob&) = delete;
+
~URLRequestMockHTTPJob() override;
// URLRequestJob overrides.
@@ -75,8 +79,6 @@
int64_t total_received_bytes_ = 0;
base::WeakPtrFactory<URLRequestMockHTTPJob> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestMockHTTPJob);
};
} // namespace net
diff --git a/net/tools/content_decoder_tool/content_decoder_tool.cc b/net/tools/content_decoder_tool/content_decoder_tool.cc
index b08cae1..ee265b6 100644
--- a/net/tools/content_decoder_tool/content_decoder_tool.cc
+++ b/net/tools/content_decoder_tool/content_decoder_tool.cc
@@ -31,6 +31,10 @@
public:
explicit StdinSourceStream(std::istream* input_stream)
: SourceStream(SourceStream::TYPE_NONE), input_stream_(input_stream) {}
+
+ StdinSourceStream(const StdinSourceStream&) = delete;
+ StdinSourceStream& operator=(const StdinSourceStream&) = delete;
+
~StdinSourceStream() override = default;
// SourceStream implementation.
@@ -53,8 +57,6 @@
private:
std::istream* input_stream_;
-
- DISALLOW_COPY_AND_ASSIGN(StdinSourceStream);
};
} // namespace
diff --git a/net/tools/huffman_trie/bit_writer.h b/net/tools/huffman_trie/bit_writer.h
index d9bfc2f..a701461 100644
--- a/net/tools/huffman_trie/bit_writer.h
+++ b/net/tools/huffman_trie/bit_writer.h
@@ -21,6 +21,10 @@
class BitWriter {
public:
BitWriter();
+
+ BitWriter(const BitWriter&) = delete;
+ BitWriter& operator=(const BitWriter&) = delete;
+
~BitWriter();
// Appends |bit| to the end of the buffer.
@@ -51,8 +55,6 @@
uint32_t position_ = 0;
std::vector<uint8_t> bytes_;
-
- DISALLOW_COPY_AND_ASSIGN(BitWriter);
};
} // namespace huffman_trie
diff --git a/net/tools/huffman_trie/trie/trie_bit_buffer.h b/net/tools/huffman_trie/trie/trie_bit_buffer.h
index 434f7d8..879d3ed0 100644
--- a/net/tools/huffman_trie/trie/trie_bit_buffer.h
+++ b/net/tools/huffman_trie/trie/trie_bit_buffer.h
@@ -25,6 +25,10 @@
class TrieBitBuffer {
public:
TrieBitBuffer();
+
+ TrieBitBuffer(const TrieBitBuffer&) = delete;
+ TrieBitBuffer& operator=(const TrieBitBuffer&) = delete;
+
~TrieBitBuffer();
// Writes |bit| to the buffer.
@@ -81,8 +85,6 @@
uint32_t used_ = 0;
std::vector<BitsOrPosition> elements_;
-
- DISALLOW_COPY_AND_ASSIGN(TrieBitBuffer);
};
} // namespace huffman_trie
diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc
index 6cb48ea..978f152d 100644
--- a/net/tools/net_watcher/net_watcher.cc
+++ b/net/tools/net_watcher/net_watcher.cc
@@ -112,6 +112,9 @@
public:
NetWatcher() = default;
+ NetWatcher(const NetWatcher&) = delete;
+ NetWatcher& operator=(const NetWatcher&) = delete;
+
~NetWatcher() override = default;
// net::NetworkChangeNotifier::IPAddressObserver implementation.
@@ -141,9 +144,6 @@
LOG(INFO) << "OnProxyConfigChanged(" << ProxyConfigToString(config.value())
<< ", " << ConfigAvailabilityToString(availability) << ")";
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(NetWatcher);
};
} // namespace
diff --git a/net/tools/quic/quic_client_message_loop_network_helper.h b/net/tools/quic/quic_client_message_loop_network_helper.h
index a0ba9ad..a13206f2 100644
--- a/net/tools/quic/quic_client_message_loop_network_helper.h
+++ b/net/tools/quic/quic_client_message_loop_network_helper.h
@@ -38,6 +38,11 @@
QuicClientMessageLooplNetworkHelper(quic::QuicChromiumClock* clock,
quic::QuicClientBase* client);
+ QuicClientMessageLooplNetworkHelper(
+ const QuicClientMessageLooplNetworkHelper&) = delete;
+ QuicClientMessageLooplNetworkHelper& operator=(
+ const QuicClientMessageLooplNetworkHelper&) = delete;
+
~QuicClientMessageLooplNetworkHelper() override;
// QuicChromiumPacketReader::Visitor
@@ -70,8 +75,6 @@
quic::QuicChromiumClock* clock_;
quic::QuicClientBase* client_;
-
- DISALLOW_COPY_AND_ASSIGN(QuicClientMessageLooplNetworkHelper);
};
} // namespace net
diff --git a/net/tools/quic/quic_http_proxy_backend.h b/net/tools/quic/quic_http_proxy_backend.h
index 7739b9d..172adc8 100644
--- a/net/tools/quic/quic_http_proxy_backend.h
+++ b/net/tools/quic/quic_http_proxy_backend.h
@@ -51,6 +51,10 @@
class QuicHttpProxyBackend : public quic::QuicSimpleServerBackend {
public:
explicit QuicHttpProxyBackend();
+
+ QuicHttpProxyBackend(const QuicHttpProxyBackend&) = delete;
+ QuicHttpProxyBackend& operator=(const QuicHttpProxyBackend&) = delete;
+
~QuicHttpProxyBackend() override;
// Must be called from the backend thread of the quic proxy
@@ -100,8 +104,6 @@
// Protects against concurrent access from quic (main) and proxy
// threads for adding and clearing a backend request handler
base::Lock backend_stream_mutex_;
-
- DISALLOW_COPY_AND_ASSIGN(QuicHttpProxyBackend);
};
} // namespace net
diff --git a/net/tools/quic/quic_http_proxy_backend_stream.h b/net/tools/quic/quic_http_proxy_backend_stream.h
index 67c7aafb..13b5b95 100644
--- a/net/tools/quic/quic_http_proxy_backend_stream.h
+++ b/net/tools/quic/quic_http_proxy_backend_stream.h
@@ -60,6 +60,11 @@
class QuicHttpProxyBackendStream : public net::URLRequest::Delegate {
public:
explicit QuicHttpProxyBackendStream(QuicHttpProxyBackend* context);
+
+ QuicHttpProxyBackendStream(const QuicHttpProxyBackendStream&) = delete;
+ QuicHttpProxyBackendStream& operator=(const QuicHttpProxyBackendStream&) =
+ delete;
+
~QuicHttpProxyBackendStream() override;
static const std::set<std::string> kHopHeaders;
@@ -157,8 +162,6 @@
std::unique_ptr<quic::QuicBackendResponse> quic_response_;
base::WeakPtrFactory<QuicHttpProxyBackendStream> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(QuicHttpProxyBackendStream);
};
} // namespace net
diff --git a/net/tools/quic/quic_simple_client.h b/net/tools/quic/quic_simple_client.h
index 5e9d4d1f..88c364eb 100644
--- a/net/tools/quic/quic_simple_client.h
+++ b/net/tools/quic/quic_simple_client.h
@@ -43,6 +43,9 @@
const quic::QuicConfig& config,
std::unique_ptr<quic::ProofVerifier> proof_verifier);
+ QuicSimpleClient(const QuicSimpleClient&) = delete;
+ QuicSimpleClient& operator=(const QuicSimpleClient&) = delete;
+
~QuicSimpleClient() override;
std::unique_ptr<quic::QuicSession> CreateQuicClientSession(
@@ -62,8 +65,6 @@
bool initialized_;
base::WeakPtrFactory<QuicSimpleClient> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(QuicSimpleClient);
};
} // namespace net
diff --git a/net/tools/quic/quic_simple_server.h b/net/tools/quic/quic_simple_server.h
index ae8b0f7..2d843db4 100644
--- a/net/tools/quic/quic_simple_server.h
+++ b/net/tools/quic/quic_simple_server.h
@@ -45,6 +45,9 @@
const quic::ParsedQuicVersionVector& supported_versions,
quic::QuicSimpleServerBackend* quic_simple_server_backend);
+ QuicSimpleServer(const QuicSimpleServer&) = delete;
+ QuicSimpleServer& operator=(const QuicSimpleServer&) = delete;
+
~QuicSimpleServer() override;
// QuicSpdyServerBase methods:
@@ -122,8 +125,6 @@
quic::QuicSimpleServerBackend* quic_simple_server_backend_;
base::WeakPtrFactory<QuicSimpleServer> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(QuicSimpleServer);
};
} // namespace net
diff --git a/net/tools/quic/quic_simple_server_packet_writer.h b/net/tools/quic/quic_simple_server_packet_writer.h
index 0b34c08..6d343255 100644
--- a/net/tools/quic/quic_simple_server_packet_writer.h
+++ b/net/tools/quic/quic_simple_server_packet_writer.h
@@ -31,6 +31,11 @@
public:
QuicSimpleServerPacketWriter(UDPServerSocket* socket,
quic::QuicDispatcher* dispatcher);
+
+ QuicSimpleServerPacketWriter(const QuicSimpleServerPacketWriter&) = delete;
+ QuicSimpleServerPacketWriter& operator=(const QuicSimpleServerPacketWriter&) =
+ delete;
+
~QuicSimpleServerPacketWriter() override;
quic::WriteResult WritePacket(const char* buffer,
@@ -63,8 +68,6 @@
bool write_blocked_;
base::WeakPtrFactory<QuicSimpleServerPacketWriter> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(QuicSimpleServerPacketWriter);
};
} // namespace net
diff --git a/net/tools/quic/synchronous_host_resolver.cc b/net/tools/quic/synchronous_host_resolver.cc
index 26e9845..54a0d61 100644
--- a/net/tools/quic/synchronous_host_resolver.cc
+++ b/net/tools/quic/synchronous_host_resolver.cc
@@ -35,6 +35,9 @@
public:
ResolverThread();
+ ResolverThread(const ResolverThread&) = delete;
+ ResolverThread& operator=(const ResolverThread&) = delete;
+
~ResolverThread() override;
// Called on the main thread.
@@ -49,8 +52,6 @@
AddressList* addresses_;
std::string host_;
int rv_;
-
- DISALLOW_COPY_AND_ASSIGN(ResolverThread);
};
ResolverThread::ResolverThread()
diff --git a/net/tools/transport_security_state_generator/pinset.h b/net/tools/transport_security_state_generator/pinset.h
index b8efca66..2b0778ae 100644
--- a/net/tools/transport_security_state_generator/pinset.h
+++ b/net/tools/transport_security_state_generator/pinset.h
@@ -20,6 +20,10 @@
class Pinset {
public:
Pinset(std::string name, std::string report_uri);
+
+ Pinset(const Pinset&) = delete;
+ Pinset& operator=(const Pinset&) = delete;
+
~Pinset();
const std::string& name() const { return name_; }
@@ -47,8 +51,6 @@
// These vectors contain names rather than actual hashes.
std::vector<std::string> static_spki_hashes_;
std::vector<std::string> bad_static_spki_hashes_;
-
- DISALLOW_COPY_AND_ASSIGN(Pinset);
};
} // namespace transport_security_state
diff --git a/net/tools/transport_security_state_generator/pinsets.h b/net/tools/transport_security_state_generator/pinsets.h
index 76790307..ac8f8b0 100644
--- a/net/tools/transport_security_state_generator/pinsets.h
+++ b/net/tools/transport_security_state_generator/pinsets.h
@@ -27,6 +27,10 @@
class Pinsets {
public:
Pinsets();
+
+ Pinsets(const Pinsets&) = delete;
+ Pinsets& operator=(const Pinsets&) = delete;
+
~Pinsets();
void RegisterSPKIHash(base::StringPiece name, const SPKIHash& hash);
@@ -44,8 +48,6 @@
// Contains all pinsets in the input JSON file.
PinsetMap pinsets_;
-
- DISALLOW_COPY_AND_ASSIGN(Pinsets);
};
} // namespace transport_security_state
diff --git a/net/url_request/report_sender.h b/net/url_request/report_sender.h
index 2400db5..484012b 100644
--- a/net/url_request/report_sender.h
+++ b/net/url_request/report_sender.h
@@ -46,6 +46,9 @@
explicit ReportSender(URLRequestContext* request_context,
net::NetworkTrafficAnnotationTag traffic_annotation);
+ ReportSender(const ReportSender&) = delete;
+ ReportSender& operator=(const ReportSender&) = delete;
+
~ReportSender() override;
// TransportSecurityState::ReportSenderInterface implementation.
@@ -64,8 +67,6 @@
net::URLRequestContext* const request_context_;
std::map<URLRequest*, std::unique_ptr<URLRequest>> inflight_requests_;
const net::NetworkTrafficAnnotationTag traffic_annotation_;
-
- DISALLOW_COPY_AND_ASSIGN(ReportSender);
};
} // namespace net
diff --git a/net/url_request/report_sender_unittest.cc b/net/url_request/report_sender_unittest.cc
index 4dee747..9523010 100644
--- a/net/url_request/report_sender_unittest.cc
+++ b/net/url_request/report_sender_unittest.cc
@@ -82,6 +82,10 @@
class MockServerErrorJob : public URLRequestJob {
public:
explicit MockServerErrorJob(URLRequest* request) : URLRequestJob(request) {}
+
+ MockServerErrorJob(const MockServerErrorJob&) = delete;
+ MockServerErrorJob& operator=(const MockServerErrorJob&) = delete;
+
~MockServerErrorJob() override = default;
protected:
@@ -92,23 +96,22 @@
"Content-Length: 0\n");
}
void Start() override { NotifyHeadersComplete(); }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockServerErrorJob);
};
class MockServerErrorJobInterceptor : public URLRequestInterceptor {
public:
MockServerErrorJobInterceptor() = default;
+
+ MockServerErrorJobInterceptor(const MockServerErrorJobInterceptor&) = delete;
+ MockServerErrorJobInterceptor& operator=(
+ const MockServerErrorJobInterceptor&) = delete;
+
~MockServerErrorJobInterceptor() override = default;
std::unique_ptr<URLRequestJob> MaybeInterceptRequest(
URLRequest* request) const override {
return std::make_unique<MockServerErrorJob>(request);
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockServerErrorJobInterceptor);
};
// A network delegate that lets tests check that a report
diff --git a/net/url_request/static_http_user_agent_settings.h b/net/url_request/static_http_user_agent_settings.h
index 0ccfe13..ab97cbf 100644
--- a/net/url_request/static_http_user_agent_settings.h
+++ b/net/url_request/static_http_user_agent_settings.h
@@ -20,6 +20,11 @@
public:
StaticHttpUserAgentSettings(const std::string& accept_language,
const std::string& user_agent);
+
+ StaticHttpUserAgentSettings(const StaticHttpUserAgentSettings&) = delete;
+ StaticHttpUserAgentSettings& operator=(const StaticHttpUserAgentSettings&) =
+ delete;
+
~StaticHttpUserAgentSettings() override;
void set_accept_language(const std::string& new_accept_language) {
@@ -33,8 +38,6 @@
private:
std::string accept_language_;
const std::string user_agent_;
-
- DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
};
} // namespace net
diff --git a/net/url_request/test_url_fetcher_factory.h b/net/url_request/test_url_fetcher_factory.h
index 44a48108..2c213962 100644
--- a/net/url_request/test_url_fetcher_factory.h
+++ b/net/url_request/test_url_fetcher_factory.h
@@ -37,12 +37,14 @@
class ScopedURLFetcherFactory {
public:
explicit ScopedURLFetcherFactory(URLFetcherFactory* factory);
+
+ ScopedURLFetcherFactory(const ScopedURLFetcherFactory&) = delete;
+ ScopedURLFetcherFactory& operator=(const ScopedURLFetcherFactory&) = delete;
+
virtual ~ScopedURLFetcherFactory();
private:
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(ScopedURLFetcherFactory);
};
// TestURLFetcher and TestURLFetcherFactory are used for testing consumers of
@@ -92,6 +94,10 @@
TestURLFetcher(int id,
const GURL& url,
URLFetcherDelegate* d);
+
+ TestURLFetcher(const TestURLFetcher&) = delete;
+ TestURLFetcher& operator=(const TestURLFetcher&) = delete;
+
~TestURLFetcher() override;
// URLFetcher implementation
@@ -236,8 +242,6 @@
int fake_max_retries_;
base::TimeDelta fake_backoff_delay_;
std::unique_ptr<URLFetcherResponseWriter> response_writer_;
-
- DISALLOW_COPY_AND_ASSIGN(TestURLFetcher);
};
// The FakeURLFetcher and FakeURLFetcherFactory classes are similar to the
@@ -276,6 +280,9 @@
const GURL& GetURL() const override;
+ FakeURLFetcher(const FakeURLFetcher&) = delete;
+ FakeURLFetcher& operator=(const FakeURLFetcher&) = delete;
+
~FakeURLFetcher() override;
private:
@@ -285,8 +292,6 @@
int64_t response_bytes_;
base::WeakPtrFactory<FakeURLFetcher> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(FakeURLFetcher);
};
// FakeURLFetcherFactory is a factory for FakeURLFetcher objects. When
@@ -370,6 +375,9 @@
FakeURLFetcherFactory(URLFetcherFactory* default_factory,
const FakeURLFetcherCreator& creator);
+ FakeURLFetcherFactory(const FakeURLFetcherFactory&) = delete;
+ FakeURLFetcherFactory& operator=(const FakeURLFetcherFactory&) = delete;
+
~FakeURLFetcherFactory() override;
// If no fake response is set for the given URL this method will delegate the
@@ -417,7 +425,6 @@
const std::string& response_data,
HttpStatusCode response_code,
Error error);
- DISALLOW_COPY_AND_ASSIGN(FakeURLFetcherFactory);
};
} // namespace net
diff --git a/net/url_request/url_fetcher_core.h b/net/url_request/url_fetcher_core.h
index 45804271..c852c75 100644
--- a/net/url_request/url_fetcher_core.h
+++ b/net/url_request/url_fetcher_core.h
@@ -164,6 +164,10 @@
class Registry {
public:
Registry();
+
+ Registry(const Registry&) = delete;
+ Registry& operator=(const Registry&) = delete;
+
~Registry();
void AddURLFetcherCore(URLFetcherCore* core);
@@ -177,8 +181,6 @@
private:
std::set<URLFetcherCore*> fetchers_;
-
- DISALLOW_COPY_AND_ASSIGN(Registry);
};
~URLFetcherCore() override;
diff --git a/net/url_request/url_fetcher_impl.h b/net/url_request/url_fetcher_impl.h
index 15bf017..c199509 100644
--- a/net/url_request/url_fetcher_impl.h
+++ b/net/url_request/url_fetcher_impl.h
@@ -33,6 +33,9 @@
class NET_EXPORT_PRIVATE URLFetcherImpl : public URLFetcher {
public:
+ URLFetcherImpl(const URLFetcherImpl&) = delete;
+ URLFetcherImpl& operator=(const URLFetcherImpl&) = delete;
+
~URLFetcherImpl() override;
// URLFetcher implementation:
@@ -131,8 +134,6 @@
static int GetNumFetcherCores();
const scoped_refptr<URLFetcherCore> core_;
-
- DISALLOW_COPY_AND_ASSIGN(URLFetcherImpl);
};
} // namespace net
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc
index 976a9ed3..3056789 100644
--- a/net/url_request/url_fetcher_impl_unittest.cc
+++ b/net/url_request/url_fetcher_impl_unittest.cc
@@ -947,6 +947,11 @@
public:
CheckUploadProgressDelegate()
: chunk_(1 << 16, 'a'), num_chunks_appended_(0), last_seen_progress_(0) {}
+
+ CheckUploadProgressDelegate(const CheckUploadProgressDelegate&) = delete;
+ CheckUploadProgressDelegate& operator=(const CheckUploadProgressDelegate&) =
+ delete;
+
~CheckUploadProgressDelegate() override = default;
void OnURLFetchUploadProgress(const URLFetcher* source,
@@ -981,8 +986,6 @@
int64_t num_chunks_appended_;
int64_t last_seen_progress_;
-
- DISALLOW_COPY_AND_ASSIGN(CheckUploadProgressDelegate);
};
TEST_F(URLFetcherTest, UploadProgress) {
@@ -1014,6 +1017,11 @@
public:
CheckDownloadProgressDelegate(int64_t file_size)
: file_size_(file_size), last_seen_progress_(0) {}
+
+ CheckDownloadProgressDelegate(const CheckDownloadProgressDelegate&) = delete;
+ CheckDownloadProgressDelegate& operator=(
+ const CheckDownloadProgressDelegate&) = delete;
+
~CheckDownloadProgressDelegate() override = default;
void OnURLFetchDownloadProgress(const URLFetcher* source,
@@ -1032,8 +1040,6 @@
private:
int64_t file_size_;
int64_t last_seen_progress_;
-
- DISALLOW_COPY_AND_ASSIGN(CheckDownloadProgressDelegate);
};
TEST_F(URLFetcherTest, DownloadProgress) {
@@ -1065,6 +1071,12 @@
class CancelOnUploadProgressDelegate : public WaitingURLFetcherDelegate {
public:
CancelOnUploadProgressDelegate() = default;
+
+ CancelOnUploadProgressDelegate(const CancelOnUploadProgressDelegate&) =
+ delete;
+ CancelOnUploadProgressDelegate& operator=(
+ const CancelOnUploadProgressDelegate&) = delete;
+
~CancelOnUploadProgressDelegate() override = default;
void OnURLFetchUploadProgress(const URLFetcher* source,
@@ -1072,9 +1084,6 @@
int64_t total) override {
CancelFetch();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CancelOnUploadProgressDelegate);
};
// Check that a fetch can be safely cancelled/deleted during an upload progress
@@ -1102,6 +1111,12 @@
class CancelOnDownloadProgressDelegate : public WaitingURLFetcherDelegate {
public:
CancelOnDownloadProgressDelegate() = default;
+
+ CancelOnDownloadProgressDelegate(const CancelOnDownloadProgressDelegate&) =
+ delete;
+ CancelOnDownloadProgressDelegate& operator=(
+ const CancelOnDownloadProgressDelegate&) = delete;
+
~CancelOnDownloadProgressDelegate() override = default;
void OnURLFetchDownloadProgress(const URLFetcher* source,
@@ -1110,9 +1125,6 @@
int64_t current_network_bytes) override {
CancelFetch();
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(CancelOnDownloadProgressDelegate);
};
// Check that a fetch can be safely cancelled/deleted during a download progress
@@ -1419,6 +1431,9 @@
: first_request_complete_(false),
second_request_context_getter_(second_request_context_getter) {}
+ ReuseFetcherDelegate(const ReuseFetcherDelegate&) = delete;
+ ReuseFetcherDelegate& operator=(const ReuseFetcherDelegate&) = delete;
+
~ReuseFetcherDelegate() override = default;
void OnURLFetchComplete(const URLFetcher* source) override {
@@ -1443,8 +1458,6 @@
private:
bool first_request_complete_;
scoped_refptr<URLRequestContextGetter> second_request_context_getter_;
-
- DISALLOW_COPY_AND_ASSIGN(ReuseFetcherDelegate);
};
TEST_F(URLFetcherTest, ReuseFetcherForSameURL) {
diff --git a/net/url_request/url_fetcher_response_writer.h b/net/url_request/url_fetcher_response_writer.h
index 202cf63..c82ca68 100644
--- a/net/url_request/url_fetcher_response_writer.h
+++ b/net/url_request/url_fetcher_response_writer.h
@@ -69,6 +69,10 @@
class NET_EXPORT URLFetcherStringWriter : public URLFetcherResponseWriter {
public:
URLFetcherStringWriter();
+
+ URLFetcherStringWriter(const URLFetcherStringWriter&) = delete;
+ URLFetcherStringWriter& operator=(const URLFetcherStringWriter&) = delete;
+
~URLFetcherStringWriter() override;
const std::string& data() const { return data_; }
@@ -83,8 +87,6 @@
private:
std::string data_;
-
- DISALLOW_COPY_AND_ASSIGN(URLFetcherStringWriter);
};
// URLFetcherResponseWriter implementation for files.
@@ -97,6 +99,10 @@
URLFetcherFileWriter(
scoped_refptr<base::SequencedTaskRunner> file_task_runner,
const base::FilePath& file_path);
+
+ URLFetcherFileWriter(const URLFetcherFileWriter&) = delete;
+ URLFetcherFileWriter& operator=(const URLFetcherFileWriter&) = delete;
+
~URLFetcherFileWriter() override;
const base::FilePath& file_path() const { return file_path_; }
@@ -142,8 +148,6 @@
CompletionOnceCallback callback_;
base::WeakPtrFactory<URLFetcherFileWriter> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(URLFetcherFileWriter);
};
} // namespace net
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 94f648b..472ab4d 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -64,6 +64,10 @@
class NET_EXPORT URLRequestContext {
public:
URLRequestContext();
+
+ URLRequestContext(const URLRequestContext&) = delete;
+ URLRequestContext& operator=(const URLRequestContext&) = delete;
+
virtual ~URLRequestContext();
// May return nullptr if this context doesn't have an associated network
@@ -339,8 +343,6 @@
bool require_network_isolation_key_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestContext);
};
} // namespace net
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 489ae32..05a75460 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -72,6 +72,10 @@
public:
explicit ContainerURLRequestContext() : storage_(this) {}
+ ContainerURLRequestContext(const ContainerURLRequestContext&) = delete;
+ ContainerURLRequestContext& operator=(const ContainerURLRequestContext&) =
+ delete;
+
~ContainerURLRequestContext() override {
#if BUILDFLAG(ENABLE_REPORTING)
// Shut down the NetworkErrorLoggingService so that destroying the
@@ -110,8 +114,6 @@
private:
URLRequestContextStorage storage_;
std::unique_ptr<TransportSecurityPersister> transport_security_persister_;
-
- DISALLOW_COPY_AND_ASSIGN(ContainerURLRequestContext);
};
} // namespace
diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h
index 2424976..560577e 100644
--- a/net/url_request/url_request_context_builder.h
+++ b/net/url_request/url_request_context_builder.h
@@ -127,6 +127,10 @@
};
URLRequestContextBuilder();
+
+ URLRequestContextBuilder(const URLRequestContextBuilder&) = delete;
+ URLRequestContextBuilder& operator=(const URLRequestContextBuilder&) = delete;
+
virtual ~URLRequestContextBuilder();
// Sets whether Brotli compression is enabled. Disabled by default;
@@ -372,8 +376,6 @@
protocol_handlers_;
ClientSocketFactory* client_socket_factory_for_testing_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestContextBuilder);
};
} // namespace net
diff --git a/net/url_request/url_request_context_storage.h b/net/url_request/url_request_context_storage.h
index 07db9e0..d58d9f8 100644
--- a/net/url_request/url_request_context_storage.h
+++ b/net/url_request/url_request_context_storage.h
@@ -49,6 +49,10 @@
// URLRequestContext, since it is often designed to be embedded in a
// URLRequestContext subclass.
explicit URLRequestContextStorage(URLRequestContext* context);
+
+ URLRequestContextStorage(const URLRequestContextStorage&) = delete;
+ URLRequestContextStorage& operator=(const URLRequestContextStorage&) = delete;
+
~URLRequestContextStorage();
// These setters will set both the member variables and call the setter on the
@@ -137,8 +141,6 @@
std::unique_ptr<ReportingService> reporting_service_;
std::unique_ptr<NetworkErrorLoggingService> network_error_logging_service_;
#endif // BUILDFLAG(ENABLE_REPORTING)
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestContextStorage);
};
} // namespace net
diff --git a/net/url_request/url_request_filter_unittest.cc b/net/url_request/url_request_filter_unittest.cc
index d0e3502..cc8e26f 100644
--- a/net/url_request/url_request_filter_unittest.cc
+++ b/net/url_request/url_request_filter_unittest.cc
@@ -26,6 +26,11 @@
class TestURLRequestInterceptor : public URLRequestInterceptor {
public:
TestURLRequestInterceptor() : job_(nullptr) {}
+
+ TestURLRequestInterceptor(const TestURLRequestInterceptor&) = delete;
+ TestURLRequestInterceptor& operator=(const TestURLRequestInterceptor&) =
+ delete;
+
~TestURLRequestInterceptor() override = default;
// URLRequestInterceptor implementation:
@@ -42,8 +47,6 @@
private:
mutable URLRequestTestJob* job_;
-
- DISALLOW_COPY_AND_ASSIGN(TestURLRequestInterceptor);
};
TEST(URLRequestFilter, BasicMatching) {
diff --git a/net/url_request/url_request_http_job_unittest.cc b/net/url_request/url_request_http_job_unittest.cc
index 7ee508d..4f26241b 100644
--- a/net/url_request/url_request_http_job_unittest.cc
+++ b/net/url_request/url_request_http_job_unittest.cc
@@ -105,6 +105,9 @@
request->context()->http_user_agent_settings()),
use_null_source_stream_(false) {}
+ TestURLRequestHttpJob(const TestURLRequestHttpJob&) = delete;
+ TestURLRequestHttpJob& operator=(const TestURLRequestHttpJob&) = delete;
+
~TestURLRequestHttpJob() override = default;
// URLRequestJob implementation:
@@ -125,8 +128,6 @@
private:
bool use_null_source_stream_;
-
- DISALLOW_COPY_AND_ASSIGN(TestURLRequestHttpJob);
};
class URLRequestHttpJobSetUpSourceTest : public TestWithTaskEnvironment {
diff --git a/net/url_request/url_request_interceptor.h b/net/url_request/url_request_interceptor.h
index 0ce071f..99daa05 100644
--- a/net/url_request/url_request_interceptor.h
+++ b/net/url_request/url_request_interceptor.h
@@ -24,6 +24,10 @@
class NET_EXPORT URLRequestInterceptor {
public:
URLRequestInterceptor();
+
+ URLRequestInterceptor(const URLRequestInterceptor&) = delete;
+ URLRequestInterceptor& operator=(const URLRequestInterceptor&) = delete;
+
virtual ~URLRequestInterceptor();
// Returns a URLRequestJob to handle |request|, if the interceptor wants to
@@ -31,9 +35,6 @@
// Otherwise, returns nullptr.
virtual std::unique_ptr<URLRequestJob> MaybeInterceptRequest(
URLRequest* request) const = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(URLRequestInterceptor);
};
} // namespace net
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 5400f1e..9ac20ba8 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -57,6 +57,10 @@
DCHECK(job_);
}
+ URLRequestJobSourceStream(const URLRequestJobSourceStream&) = delete;
+ URLRequestJobSourceStream& operator=(const URLRequestJobSourceStream&) =
+ delete;
+
~URLRequestJobSourceStream() override = default;
// SourceStream implementation:
@@ -77,8 +81,6 @@
// indirectly owns |this|. Therefore, |job_| will not be destroyed when |this|
// is alive.
URLRequestJob* const job_;
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestJobSourceStream);
};
URLRequestJob::URLRequestJob(URLRequest* request)
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 7cd566d..d0721381 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -52,6 +52,10 @@
class NET_EXPORT URLRequestJob {
public:
explicit URLRequestJob(URLRequest* request);
+
+ URLRequestJob(const URLRequestJob&) = delete;
+ URLRequestJob& operator=(const URLRequestJob&) = delete;
+
virtual ~URLRequestJob();
// Returns the request that owns this job.
@@ -447,8 +451,6 @@
CompletionOnceCallback read_raw_callback_;
base::WeakPtrFactory<URLRequestJob> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestJob);
};
} // namespace net
diff --git a/net/url_request/url_request_job_factory.h b/net/url_request/url_request_job_factory.h
index 9d31c6c..7809cdf 100644
--- a/net/url_request/url_request_job_factory.h
+++ b/net/url_request/url_request_job_factory.h
@@ -41,6 +41,10 @@
};
URLRequestJobFactory();
+
+ URLRequestJobFactory(const URLRequestJobFactory&) = delete;
+ URLRequestJobFactory& operator=(const URLRequestJobFactory&) = delete;
+
virtual ~URLRequestJobFactory();
// Sets the ProtocolHandler for a scheme. Returns true on success, false on
@@ -77,8 +81,6 @@
static void SetInterceptorForTesting(URLRequestInterceptor* interceptor);
ProtocolHandlerMap protocol_handler_map_;
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestJobFactory);
};
} // namespace net
diff --git a/net/url_request/url_request_throttler_manager.h b/net/url_request/url_request_throttler_manager.h
index 308a4726..4f52382 100644
--- a/net/url_request/url_request_throttler_manager.h
+++ b/net/url_request/url_request_throttler_manager.h
@@ -37,6 +37,11 @@
public NetworkChangeNotifier::ConnectionTypeObserver {
public:
URLRequestThrottlerManager();
+
+ URLRequestThrottlerManager(const URLRequestThrottlerManager&) = delete;
+ URLRequestThrottlerManager& operator=(const URLRequestThrottlerManager&) =
+ delete;
+
~URLRequestThrottlerManager() override;
// Must be called for every request, returns the URL request throttler entry
@@ -140,8 +145,6 @@
base::PlatformThreadId registered_from_thread_;
THREAD_CHECKER(thread_checker_);
-
- DISALLOW_COPY_AND_ASSIGN(URLRequestThrottlerManager);
};
} // namespace net
diff --git a/net/url_request/url_request_throttler_test_support.h b/net/url_request/url_request_throttler_test_support.h
index ede659f..b3e2c8c 100644
--- a/net/url_request/url_request_throttler_test_support.h
+++ b/net/url_request/url_request_throttler_test_support.h
@@ -16,6 +16,10 @@
public:
TestTickClock();
explicit TestTickClock(base::TimeTicks now);
+
+ TestTickClock(const TestTickClock&) = delete;
+ TestTickClock& operator=(const TestTickClock&) = delete;
+
~TestTickClock() override;
base::TimeTicks NowTicks() const override;
@@ -23,7 +27,6 @@
private:
base::TimeTicks now_ticks_;
- DISALLOW_COPY_AND_ASSIGN(TestTickClock);
};
} // namespace net
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 0ab74888..8e37ec3 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -3586,6 +3586,10 @@
public:
explicit FixedDateNetworkDelegate(const std::string& fixed_date)
: fixed_date_(fixed_date) {}
+
+ FixedDateNetworkDelegate(const FixedDateNetworkDelegate&) = delete;
+ FixedDateNetworkDelegate& operator=(const FixedDateNetworkDelegate&) = delete;
+
~FixedDateNetworkDelegate() override = default;
// NetworkDelegate implementation
@@ -3599,8 +3603,6 @@
private:
std::string fixed_date_;
-
- DISALLOW_COPY_AND_ASSIGN(FixedDateNetworkDelegate);
};
int FixedDateNetworkDelegate::OnHeadersReceived(
@@ -3750,6 +3752,12 @@
: public URLRequestJobFactory::ProtocolHandler {
public:
UnsafeRedirectProtocolHandler() = default;
+
+ UnsafeRedirectProtocolHandler(const UnsafeRedirectProtocolHandler&) =
+ delete;
+ UnsafeRedirectProtocolHandler& operator=(
+ const UnsafeRedirectProtocolHandler&) = delete;
+
~UnsafeRedirectProtocolHandler() override = default;
// URLRequestJobFactory::ProtocolHandler implementation:
@@ -3763,9 +3771,6 @@
bool IsSafeRedirectTarget(const GURL& location) const override {
return false;
}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UnsafeRedirectProtocolHandler);
};
// URLRequestTest interface:
@@ -5013,6 +5018,11 @@
class AsyncLoggingNetworkDelegate : public TestNetworkDelegate {
public:
AsyncLoggingNetworkDelegate() = default;
+
+ AsyncLoggingNetworkDelegate(const AsyncLoggingNetworkDelegate&) = delete;
+ AsyncLoggingNetworkDelegate& operator=(const AsyncLoggingNetworkDelegate&) =
+ delete;
+
~AsyncLoggingNetworkDelegate() override = default;
// NetworkDelegate implementation.
@@ -5065,8 +5075,6 @@
base::BindOnce(std::move(callback), OK));
return ERR_IO_PENDING;
}
-
- DISALLOW_COPY_AND_ASSIGN(AsyncLoggingNetworkDelegate);
};
// URLRequest::Delegate that logs delegate information when the headers
@@ -5093,6 +5101,12 @@
else if (cancel_stage == CANCEL_ON_READ_COMPLETED)
set_cancel_in_received_data(true);
}
+
+ AsyncLoggingUrlRequestDelegate(const AsyncLoggingUrlRequestDelegate&) =
+ delete;
+ AsyncLoggingUrlRequestDelegate& operator=(
+ const AsyncLoggingUrlRequestDelegate&) = delete;
+
~AsyncLoggingUrlRequestDelegate() override = default;
// URLRequest::Delegate implementation:
@@ -5150,8 +5164,6 @@
}
const CancelStage cancel_stage_;
-
- DISALLOW_COPY_AND_ASSIGN(AsyncLoggingUrlRequestDelegate);
};
// Tests handling of delegate info before a request starts.
@@ -8981,6 +8993,10 @@
explicit FailingHttpTransactionFactory(HttpNetworkSession* network_session)
: network_session_(network_session) {}
+ FailingHttpTransactionFactory(const FailingHttpTransactionFactory&) = delete;
+ FailingHttpTransactionFactory& operator=(
+ const FailingHttpTransactionFactory&) = delete;
+
~FailingHttpTransactionFactory() override = default;
// HttpTransactionFactory methods:
@@ -8995,8 +9011,6 @@
private:
HttpNetworkSession* network_session_;
-
- DISALLOW_COPY_AND_ASSIGN(FailingHttpTransactionFactory);
};
} // namespace
@@ -12270,6 +12284,10 @@
public:
ZeroRTTResponse(bool zero_rtt, bool send_too_early)
: zero_rtt_(zero_rtt), send_too_early_(send_too_early) {}
+
+ ZeroRTTResponse(const ZeroRTTResponse&) = delete;
+ ZeroRTTResponse& operator=(const ZeroRTTResponse&) = delete;
+
~ZeroRTTResponse() override {}
void SendResponse(const test_server::SendBytesCallback& send,
@@ -12294,8 +12312,6 @@
private:
bool zero_rtt_;
bool send_too_early_;
-
- DISALLOW_COPY_AND_ASSIGN(ZeroRTTResponse);
};
std::unique_ptr<test_server::HttpResponse> HandleZeroRTTRequest(
diff --git a/net/websockets/websocket_basic_handshake_stream.h b/net/websockets/websocket_basic_handshake_stream.h
index 003a11d..ce3beb73 100644
--- a/net/websockets/websocket_basic_handshake_stream.h
+++ b/net/websockets/websocket_basic_handshake_stream.h
@@ -43,6 +43,10 @@
WebSocketStreamRequestAPI* request,
WebSocketEndpointLockManager* websocket_endpoint_lock_manager);
+ WebSocketBasicHandshakeStream(const WebSocketBasicHandshakeStream&) = delete;
+ WebSocketBasicHandshakeStream& operator=(
+ const WebSocketBasicHandshakeStream&) = delete;
+
~WebSocketBasicHandshakeStream() override;
// HttpStreamBase methods
@@ -152,8 +156,6 @@
WebSocketEndpointLockManager* const websocket_endpoint_lock_manager_;
base::WeakPtrFactory<WebSocketBasicHandshakeStream> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketBasicHandshakeStream);
};
} // namespace net
diff --git a/net/websockets/websocket_channel.h b/net/websockets/websocket_channel.h
index 2d9f495..8323049 100644
--- a/net/websockets/websocket_channel.h
+++ b/net/websockets/websocket_channel.h
@@ -76,6 +76,10 @@
// connection process.
WebSocketChannel(std::unique_ptr<WebSocketEventInterface> event_interface,
URLRequestContext* url_request_context);
+
+ WebSocketChannel(const WebSocketChannel&) = delete;
+ WebSocketChannel& operator=(const WebSocketChannel&) = delete;
+
virtual ~WebSocketChannel();
// Starts the connection process.
@@ -388,8 +392,6 @@
// True if we're waiting for OnReadDone() callback.
bool is_reading_ = false;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketChannel);
};
} // namespace net
diff --git a/net/websockets/websocket_deflate_stream.h b/net/websockets/websocket_deflate_stream.h
index 20f2ea9..4960126f 100644
--- a/net/websockets/websocket_deflate_stream.h
+++ b/net/websockets/websocket_deflate_stream.h
@@ -43,6 +43,10 @@
WebSocketDeflateStream(std::unique_ptr<WebSocketStream> stream,
const WebSocketDeflateParameters& params,
std::unique_ptr<WebSocketDeflatePredictor> predictor);
+
+ WebSocketDeflateStream(const WebSocketDeflateStream&) = delete;
+ WebSocketDeflateStream& operator=(const WebSocketDeflateStream&) = delete;
+
~WebSocketDeflateStream() override;
// WebSocketStream functions.
@@ -106,8 +110,6 @@
std::vector<scoped_refptr<IOBufferWithSize>> deflater_outputs_;
// References of Inflater outputs kept until next ReadFrames().
std::vector<scoped_refptr<IOBufferWithSize>> inflater_outputs_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketDeflateStream);
};
} // namespace net
diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc
index 6abcbff7..b0dee6c 100644
--- a/net/websockets/websocket_deflate_stream_test.cc
+++ b/net/websockets/websocket_deflate_stream_test.cc
@@ -93,6 +93,11 @@
class WebSocketDeflatePredictorMock : public WebSocketDeflatePredictor {
public:
WebSocketDeflatePredictorMock() : result_(DEFLATE) {}
+
+ WebSocketDeflatePredictorMock(const WebSocketDeflatePredictorMock&) = delete;
+ WebSocketDeflatePredictorMock& operator=(
+ const WebSocketDeflatePredictorMock&) = delete;
+
~WebSocketDeflatePredictorMock() override {
// Verify whether all expectaions are consumed.
if (!frames_to_be_input_.empty()) {
@@ -187,8 +192,6 @@
// Pushed by |RecordWrittenFrames| and popped and verified by
// |VerifySentFrame|.
base::circular_deque<const WebSocketFrame*> frames_written_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketDeflatePredictorMock);
};
class WebSocketDeflateStreamTest : public ::testing::Test {
diff --git a/net/websockets/websocket_deflater.h b/net/websockets/websocket_deflater.h
index d72c7335..3040d67 100644
--- a/net/websockets/websocket_deflater.h
+++ b/net/websockets/websocket_deflater.h
@@ -30,6 +30,10 @@
};
explicit WebSocketDeflater(ContextTakeOverMode mode);
+
+ WebSocketDeflater(const WebSocketDeflater&) = delete;
+ WebSocketDeflater& operator=(const WebSocketDeflater&) = delete;
+
~WebSocketDeflater();
// Returns true if there is no error and false otherwise.
@@ -69,8 +73,6 @@
std::vector<char> fixed_buffer_;
// true if bytes were added after last Finish().
bool are_bytes_added_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketDeflater);
};
} // namespace net
diff --git a/net/websockets/websocket_event_interface.h b/net/websockets/websocket_event_interface.h
index 1ee46ef..b9fe963 100644
--- a/net/websockets/websocket_event_interface.h
+++ b/net/websockets/websocket_event_interface.h
@@ -38,6 +38,9 @@
public:
typedef int WebSocketMessageType;
+ WebSocketEventInterface(const WebSocketEventInterface&) = delete;
+ WebSocketEventInterface& operator=(const WebSocketEventInterface&) = delete;
+
virtual ~WebSocketEventInterface() {}
// Called when a URLRequest is created for handshaking.
@@ -156,9 +159,6 @@
protected:
WebSocketEventInterface() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebSocketEventInterface);
};
} // namespace net
diff --git a/net/websockets/websocket_extension_parser.h b/net/websockets/websocket_extension_parser.h
index ebba4f04..842f4a1 100644
--- a/net/websockets/websocket_extension_parser.h
+++ b/net/websockets/websocket_extension_parser.h
@@ -21,6 +21,10 @@
class NET_EXPORT_PRIVATE WebSocketExtensionParser {
public:
WebSocketExtensionParser();
+
+ WebSocketExtensionParser(const WebSocketExtensionParser&) = delete;
+ WebSocketExtensionParser& operator=(const WebSocketExtensionParser&) = delete;
+
~WebSocketExtensionParser();
// Parses the given string as a Sec-WebSocket-Extensions header value.
@@ -55,8 +59,6 @@
// The pointer of the end of the input string.
const char* end_;
std::vector<WebSocketExtension> extensions_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketExtensionParser);
};
} // namespace net
diff --git a/net/websockets/websocket_frame_parser.h b/net/websockets/websocket_frame_parser.h
index 141a945..87e3b569 100644
--- a/net/websockets/websocket_frame_parser.h
+++ b/net/websockets/websocket_frame_parser.h
@@ -27,6 +27,10 @@
class NET_EXPORT WebSocketFrameParser {
public:
WebSocketFrameParser();
+
+ WebSocketFrameParser(const WebSocketFrameParser&) = delete;
+ WebSocketFrameParser& operator=(const WebSocketFrameParser&) = delete;
+
~WebSocketFrameParser();
// Decodes the given byte stream and stores parsed WebSocket frames in
@@ -81,8 +85,6 @@
uint64_t frame_offset_;
WebSocketError websocket_error_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketFrameParser);
};
} // namespace net
diff --git a/net/websockets/websocket_handshake_stream_base.h b/net/websockets/websocket_handshake_stream_base.h
index d1c4bc93..230476a 100644
--- a/net/websockets/websocket_handshake_stream_base.h
+++ b/net/websockets/websocket_handshake_stream_base.h
@@ -83,6 +83,11 @@
};
WebSocketHandshakeStreamBase() = default;
+
+ WebSocketHandshakeStreamBase(const WebSocketHandshakeStreamBase&) = delete;
+ WebSocketHandshakeStreamBase& operator=(const WebSocketHandshakeStreamBase&) =
+ delete;
+
~WebSocketHandshakeStreamBase() override = default;
// An object that stores data needed for the creation of a
@@ -148,9 +153,6 @@
WebSocketExtensionParams* params);
void RecordHandshakeResult(HandshakeResult result);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebSocketHandshakeStreamBase);
};
} // namespace net
diff --git a/net/websockets/websocket_handshake_stream_create_helper.h b/net/websockets/websocket_handshake_stream_create_helper.h
index a684232..dfafe40 100644
--- a/net/websockets/websocket_handshake_stream_create_helper.h
+++ b/net/websockets/websocket_handshake_stream_create_helper.h
@@ -36,6 +36,11 @@
const std::vector<std::string>& requested_subprotocols,
WebSocketStreamRequestAPI* request);
+ WebSocketHandshakeStreamCreateHelper(
+ const WebSocketHandshakeStreamCreateHelper&) = delete;
+ WebSocketHandshakeStreamCreateHelper& operator=(
+ const WebSocketHandshakeStreamCreateHelper&) = delete;
+
~WebSocketHandshakeStreamCreateHelper() override;
// WebSocketHandshakeStreamBase::CreateHelper methods
@@ -55,8 +60,6 @@
WebSocketStream::ConnectDelegate* const connect_delegate_;
const std::vector<std::string> requested_subprotocols_;
WebSocketStreamRequestAPI* const request_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketHandshakeStreamCreateHelper);
};
} // namespace net
diff --git a/net/websockets/websocket_http2_handshake_stream.h b/net/websockets/websocket_http2_handshake_stream.h
index 19edfd2..0f5e3040 100644
--- a/net/websockets/websocket_http2_handshake_stream.h
+++ b/net/websockets/websocket_http2_handshake_stream.h
@@ -56,6 +56,10 @@
WebSocketStreamRequestAPI* request,
std::vector<std::string> dns_aliases);
+ WebSocketHttp2HandshakeStream(const WebSocketHttp2HandshakeStream&) = delete;
+ WebSocketHttp2HandshakeStream& operator=(
+ const WebSocketHttp2HandshakeStream&) = delete;
+
~WebSocketHttp2HandshakeStream() override;
// HttpStream methods.
@@ -196,8 +200,6 @@
std::vector<std::string> dns_aliases_;
base::WeakPtrFactory<WebSocketHttp2HandshakeStream> weak_ptr_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketHttp2HandshakeStream);
};
} // namespace net
diff --git a/net/websockets/websocket_inflater.h b/net/websockets/websocket_inflater.h
index e92fea3..0b583a6 100644
--- a/net/websockets/websocket_inflater.h
+++ b/net/websockets/websocket_inflater.h
@@ -29,6 +29,10 @@
// |input_queue_capacity| is a capacity for each contiguous block in the
// input queue. The input queue can grow without limit.
WebSocketInflater(size_t input_queue_capacity, size_t output_buffer_capacity);
+
+ WebSocketInflater(const WebSocketInflater&) = delete;
+ WebSocketInflater& operator=(const WebSocketInflater&) = delete;
+
~WebSocketInflater();
// Returns true if there is no error.
@@ -123,8 +127,6 @@
std::unique_ptr<z_stream_s> stream_;
InputQueue input_queue_;
OutputBuffer output_buffer_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketInflater);
};
} // namespace net
diff --git a/net/websockets/websocket_stream.h b/net/websockets/websocket_stream.h
index 8c3f483..4e6e449 100644
--- a/net/websockets/websocket_stream.h
+++ b/net/websockets/websocket_stream.h
@@ -180,6 +180,9 @@
std::unique_ptr<base::OneShotTimer> timer,
std::unique_ptr<WebSocketStreamRequestAPI> api_delegate);
+ WebSocketStream(const WebSocketStream&) = delete;
+ WebSocketStream& operator=(const WebSocketStream&) = delete;
+
// Derived classes must make sure Close() is called when the stream is not
// closed on destruction.
virtual ~WebSocketStream();
@@ -270,9 +273,6 @@
protected:
WebSocketStream();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WebSocketStream);
};
// A helper function used in the implementation of CreateAndConnectStream() and
diff --git a/net/websockets/websocket_stream_create_test_base.h b/net/websockets/websocket_stream_create_test_base.h
index 3ec3374f5..e670a4e 100644
--- a/net/websockets/websocket_stream_create_test_base.h
+++ b/net/websockets/websocket_stream_create_test_base.h
@@ -38,6 +38,11 @@
using HeaderKeyValuePair = std::pair<std::string, std::string>;
WebSocketStreamCreateTestBase();
+
+ WebSocketStreamCreateTestBase(const WebSocketStreamCreateTestBase&) = delete;
+ WebSocketStreamCreateTestBase& operator=(
+ const WebSocketStreamCreateTestBase&) = delete;
+
virtual ~WebSocketStreamCreateTestBase();
// A wrapper for CreateAndConnectStreamForTesting that knows about our default
@@ -100,7 +105,6 @@
private:
class TestConnectDelegate;
- DISALLOW_COPY_AND_ASSIGN(WebSocketStreamCreateTestBase);
};
} // namespace net
diff --git a/net/websockets/websocket_test_util.h b/net/websockets/websocket_test_util.h
index f59ba89..7bcba01 100644
--- a/net/websockets/websocket_test_util.h
+++ b/net/websockets/websocket_test_util.h
@@ -103,6 +103,12 @@
class WebSocketMockClientSocketFactoryMaker {
public:
WebSocketMockClientSocketFactoryMaker();
+
+ WebSocketMockClientSocketFactoryMaker(
+ const WebSocketMockClientSocketFactoryMaker&) = delete;
+ WebSocketMockClientSocketFactoryMaker& operator=(
+ const WebSocketMockClientSocketFactoryMaker&) = delete;
+
~WebSocketMockClientSocketFactoryMaker();
// Tell the factory to create a socket which expects |expect_written| to be
@@ -132,8 +138,6 @@
private:
struct Detail;
std::unique_ptr<Detail> detail_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketMockClientSocketFactoryMaker);
};
// This class encapsulates the details of creating a
@@ -142,6 +146,12 @@
struct WebSocketTestURLRequestContextHost {
public:
WebSocketTestURLRequestContextHost();
+
+ WebSocketTestURLRequestContextHost(
+ const WebSocketTestURLRequestContextHost&) = delete;
+ WebSocketTestURLRequestContextHost& operator=(
+ const WebSocketTestURLRequestContextHost&) = delete;
+
~WebSocketTestURLRequestContextHost();
void SetExpectations(const std::string& expect_written,
@@ -175,8 +185,6 @@
TestNetworkDelegate network_delegate_;
std::unique_ptr<ProxyResolutionService> proxy_resolution_service_;
bool url_request_context_initialized_;
-
- DISALLOW_COPY_AND_ASSIGN(WebSocketTestURLRequestContextHost);
};
// WebSocketStream::ConnectDelegate implementation that does nothing.
@@ -233,13 +241,16 @@
/* requested_subprotocols = */ {},
&request_) {}
+ TestWebSocketHandshakeStreamCreateHelper(
+ const TestWebSocketHandshakeStreamCreateHelper&) = delete;
+ TestWebSocketHandshakeStreamCreateHelper& operator=(
+ const TestWebSocketHandshakeStreamCreateHelper&) = delete;
+
~TestWebSocketHandshakeStreamCreateHelper() override = default;
private:
DummyConnectDelegate connect_delegate_;
TestWebSocketStreamRequestAPI request_;
-
- DISALLOW_COPY_AND_ASSIGN(TestWebSocketHandshakeStreamCreateHelper);
};
} // namespace net
