Rewrite most `Foo* field_` pointer fields to `raw_ptr<Foo> field_`.
DO NOT REVERT (unless absolutely necessary)! Report build breaks to keishi@(APAC)/glazunov@(EMEA)/sebmarchand@(NA) as soon as you see them. Fixes are expected to be trivial.
This commit was generated automatically, by running the following script: tools/clang/rewrite_raw_ptr_fields/rewrite-multiple-platforms.sh on commit fe74bc434e5b7e92d13a328362fcb6df15d8847e
For more information, see MiraclePtr One Pager [1], the PSA at chromium-dev@ [2], and the raw_ptr documentation in //base/memory/raw_ptr.md.
FYI This CL does not enable MiraclePtr protection and we expect no behavior change from this.
[1] https://docs.google.com/document/d/1pnnOAIz_DMWDI4oIOFoMAqLnf_MZ2GsrJNb_dbQ3ZBg/edit?usp=sharing
[2] https://groups.google.com/a/chromium.org/g/chromium-dev/c/vAEeVifyf78/m/SkBUc6PhBAAJ
Binary-Size: Increase of around 500kb was approved for MiraclePtr
Include-Ci-Only-Tests: true
No-Tree-Checks: true
No-Presubmit: true
Bug: 1272324, 1073933
Change-Id: I05c86a83bbb4b3f4b017f361dd7f4e7437697f69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3305132
Commit-Queue: Keishi Hattori <[email protected]>
Reviewed-by: Bartek Nowierski <[email protected]>
Owners-Override: Bartek Nowierski <[email protected]>
Cr-Commit-Position: refs/heads/main@{#945735}
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index ad72beb..e70d2ee 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/memory/raw_ptr.h"
#include "net/socket/transport_client_socket_pool.h"
#include <stdint.h>
@@ -535,7 +536,7 @@
bool waiting_success_;
const JobType job_type_;
- MockClientSocketFactory* const client_socket_factory_;
+ const raw_ptr<MockClientSocketFactory> client_socket_factory_;
LoadState load_state_;
bool has_established_connection_;
bool store_additional_error_state_;
@@ -594,9 +595,9 @@
private:
TestConnectJob::JobType job_type_ = TestConnectJob::kMockJob;
- std::list<TestConnectJob::JobType>* job_types_ = nullptr;
+ raw_ptr<std::list<TestConnectJob::JobType>> job_types_ = nullptr;
base::TimeDelta timeout_duration_;
- MockClientSocketFactory* const client_socket_factory_;
+ const raw_ptr<MockClientSocketFactory> client_socket_factory_;
};
} // namespace
@@ -737,7 +738,7 @@
nullptr /* websocket_endpoint_lock_manager */};
bool connect_backup_jobs_enabled_;
MockClientSocketFactory client_socket_factory_;
- TestConnectJobFactory* connect_job_factory_;
+ raw_ptr<TestConnectJobFactory> connect_job_factory_;
RecordingNetLogObserver net_log_observer_;
// These parameters are never actually used to create a TransportConnectJob.
scoped_refptr<ClientSocketPool::SocketParams> params_;
@@ -2934,7 +2935,7 @@
ClientSocketPool::ProxyAuthCallback(), pool_, NetLogWithSource()));
}
- TransportClientSocketPool* const pool_;
+ const raw_ptr<TransportClientSocketPool> pool_;
int expected_result_;
bool reset_releasing_handle_;
ClientSocketHandle handle_;
@@ -3068,7 +3069,7 @@
const ClientSocketPool::GroupId group_id_;
const scoped_refptr<ClientSocketPool::SocketParams> params_;
- TransportClientSocketPool* const pool_;
+ const raw_ptr<TransportClientSocketPool> pool_;
ClientSocketHandle handle_;
TestCompletionCallback nested_callback_;
};
@@ -4835,7 +4836,7 @@
MOCK_METHOD0(CloseOneIdleConnection, bool());
private:
- TransportClientSocketPool* const pool_;
+ const raw_ptr<TransportClientSocketPool> pool_;
ClientSocketHandle handle_;
TestCompletionCallback callback_;
const ClientSocketPool::GroupId group_id_;
