diff options
Diffstat (limited to 'chromium/services/proxy_resolver/proxy_resolver_v8_tracing.cc')
| -rw-r--r-- | chromium/services/proxy_resolver/proxy_resolver_v8_tracing.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/chromium/services/proxy_resolver/proxy_resolver_v8_tracing.cc b/chromium/services/proxy_resolver/proxy_resolver_v8_tracing.cc index 940b3b75eaa..c118c9fe013 100644 --- a/chromium/services/proxy_resolver/proxy_resolver_v8_tracing.cc +++ b/chromium/services/proxy_resolver/proxy_resolver_v8_tracing.cc @@ -12,11 +12,11 @@ #include <vector> #include "base/bind.h" -#include "base/macros.h" -#include "base/single_thread_task_runner.h" +#include "base/memory/raw_ptr.h" #include "base/strings/stringprintf.h" #include "base/synchronization/atomic_flag.h" #include "base/synchronization/waitable_event.h" +#include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "base/threading/thread_restrictions.h" @@ -96,9 +96,9 @@ class Job : public base::RefCountedThreadSafe<Job>, worker_task_runner(worker_task_runner), num_outstanding_callbacks(num_outstanding_callbacks) {} - ProxyResolverV8* v8_resolver; + raw_ptr<ProxyResolverV8> v8_resolver; scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner; - int* num_outstanding_callbacks; + raw_ptr<int> num_outstanding_callbacks; }; // |params| is non-owned. It contains the parameters for this Job, and must // outlive it. @@ -218,7 +218,7 @@ class Job : public base::RefCountedThreadSafe<Job>, // The Parameters for this Job. // Initialized on origin thread and then accessed from both threads. - const Params* const params_; + const raw_ptr<const Params> params_; std::unique_ptr<ProxyResolverV8Tracing::Bindings> bindings_; @@ -255,13 +255,14 @@ class Job : public base::RefCountedThreadSafe<Job>, // ------------------------------------------------------- scoped_refptr<net::PacFileData> script_data_; - std::unique_ptr<ProxyResolverV8>* resolver_out_; + raw_ptr<std::unique_ptr<ProxyResolverV8>> resolver_out_; // ------------------------------------------------------- // State specific to GET_PROXY_FOR_URL. // ------------------------------------------------------- - net::ProxyInfo* user_results_; // Owned by caller, lives on origin thread. + raw_ptr<net::ProxyInfo> + user_results_; // Owned by caller, lives on origin thread. GURL url_; net::NetworkIsolationKey network_isolation_key_; net::ProxyInfo results_; @@ -860,7 +861,7 @@ void Job::SaveDnsToLocalCache(const std::string& host, std::string Job::MakeDnsCacheKey(const std::string& host, net::ProxyResolveDnsOperation op) { - return base::StringPrintf("%d:%s", op, host.c_str()); + return base::StringPrintf("%d:%s", static_cast<int>(op), host.c_str()); } void Job::HandleAlertOrError(bool is_alert, @@ -1083,12 +1084,12 @@ class ProxyResolverV8TracingFactoryImpl::CreateJob thread_.reset(); } - ProxyResolverV8TracingFactoryImpl* factory_; + raw_ptr<ProxyResolverV8TracingFactoryImpl> factory_; std::unique_ptr<base::Thread> thread_; std::unique_ptr<Job::Params> job_params_; scoped_refptr<Job> create_resolver_job_; std::unique_ptr<ProxyResolverV8> v8_resolver_; - std::unique_ptr<ProxyResolverV8Tracing>* resolver_out_; + raw_ptr<std::unique_ptr<ProxyResolverV8Tracing>> resolver_out_; net::CompletionOnceCallback callback_; int num_outstanding_callbacks_; }; |