net: Remove unused private data members

These unused members were found by locally changing DISALLOW_COPY_AND_ASSIGN to use "= delete"
so that the compiler can be sure these members are not used in the copy ctor and operator=.

BUG=447445
TEST=build

Review URL: https://codereview.chromium.org/838203002

Cr-Commit-Position: refs/heads/master@{#310712}

20 files changed, 32 insertions, 75 deletions

diff --git a/net/cookies/parsed_cookie.h b/net/cookies/parsed_cookie.h
index 8a8e135..115ca1f 100644
--- a/net/cookies/parsed_cookie.h
+++ b/net/cookies/parsed_cookie.h
@@ -128,7 +128,6 @@ class NET_EXPORT ParsedCookie {
   void ClearAttributePair(size_t index);
 
   PairList pairs_;
-  bool is_valid_;
   // These will default to 0, but that should never be valid since the
   // 0th index is the user supplied token/value, not an attribute.
   // We're really never going to have more than like 8 attributes, so we
diff --git a/net/dns/mdns_client_impl.cc b/net/dns/mdns_client_impl.cc
index 622bca9..66873ab 100644
--- a/net/dns/mdns_client_impl.cc
+++ b/net/dns/mdns_client_impl.cc
@@ -195,8 +195,7 @@ void MDnsConnection::OnDatagramReceived(
   delegate_->HandlePacket(response, bytes_read);
 }
 
-MDnsClientImpl::Core::Core(MDnsClientImpl* client)
-    : client_(client), connection_(new MDnsConnection(this)) {
+MDnsClientImpl::Core::Core() : connection_(new MDnsConnection(this)) {
 }
 
 MDnsClientImpl::Core::~Core() {
@@ -424,7 +423,7 @@ MDnsClientImpl::~MDnsClientImpl() {
 
 bool MDnsClientImpl::StartListening(MDnsSocketFactory* socket_factory) {
   DCHECK(!core_.get());
-  core_.reset(new Core(this));
+  core_.reset(new Core());
   if (!core_->Init(socket_factory)) {
     core_.reset();
     return false;
diff --git a/net/dns/mdns_client_impl.h b/net/dns/mdns_client_impl.h
index 0dfedf9..4ed85f2 100644
--- a/net/dns/mdns_client_impl.h
+++ b/net/dns/mdns_client_impl.h
@@ -109,7 +109,7 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
   // invalidate the core.
   class Core : public base::SupportsWeakPtr<Core>, MDnsConnection::Delegate {
    public:
-    explicit Core(MDnsClientImpl* client);
+    Core();
     ~Core() override;
 
     // Initialize the core. Returns true on success.
@@ -157,7 +157,6 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
 
     ListenerMap listeners_;
 
-    MDnsClientImpl* client_;
     MDnsCache cache_;
 
     base::CancelableClosure cleanup_callback_;
diff --git a/net/filter/mock_filter_context.h b/net/filter/mock_filter_context.h
index 776a237..f66939d 100644
--- a/net/filter/mock_filter_context.h
+++ b/net/filter/mock_filter_context.h
@@ -78,7 +78,6 @@ class MockFilterContext : public FilterContext {
   const BoundNetLog& GetNetLog() const override;
 
  private:
-  int buffer_size_;
   std::string mime_type_;
   std::string content_disposition_;
   GURL gurl_;
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 4898594..50420db 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -44,8 +44,8 @@ net::ClientSocketPoolManager* CreateSocketPoolManager(
       params.host_resolver, params.cert_verifier, params.channel_id_service,
       params.transport_security_state, params.cert_transparency_verifier,
       params.cert_policy_enforcer, params.ssl_session_cache_shard,
-      params.proxy_service, params.ssl_config_service,
-      params.enable_ssl_connect_job_waiting, params.proxy_delegate, pool_type);
+      params.ssl_config_service, params.enable_ssl_connect_job_waiting,
+      pool_type);
 }
 
 }  // unnamed namespace
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 21a8c00..136791e 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -562,12 +562,12 @@ CaptureGroupNameSocketPool<ParentPool>::CaptureGroupNameSocketPool(
     CertVerifier* /* cert_verifier */)
     : ParentPool(0, 0, NULL, host_resolver, NULL, NULL) {}
 
-template<>
+template <>
 CaptureGroupNameHttpProxySocketPool::CaptureGroupNameSocketPool(
     HostResolver* host_resolver,
     CertVerifier* /* cert_verifier */)
-    : HttpProxyClientSocketPool(
-          0, 0, NULL, host_resolver, NULL, NULL, NULL, NULL) {}
+    : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL) {
+}
 
 template <>
 CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool(
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index 1f45882..b68f30a 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -86,7 +86,6 @@ HttpProxyConnectJob::HttpProxyConnectJob(
     const base::TimeDelta& timeout_duration,
     TransportClientSocketPool* transport_pool,
     SSLClientSocketPool* ssl_pool,
-    HostResolver* host_resolver,
     Delegate* delegate,
     NetLog* net_log)
     : ConnectJob(group_name, timeout_duration, priority, delegate,
@@ -94,7 +93,6 @@ HttpProxyConnectJob::HttpProxyConnectJob(
       params_(params),
       transport_pool_(transport_pool),
       ssl_pool_(ssl_pool),
-      resolver_(host_resolver),
       using_spdy_(false),
       protocol_negotiated_(kProtoUnknown),
       weak_ptr_factory_(this) {
@@ -395,12 +393,10 @@ HttpProxyConnectJobFactory::HttpProxyConnectJobFactory(
     TransportClientSocketPool* transport_pool,
     SSLClientSocketPool* ssl_pool,
     HostResolver* host_resolver,
-    const ProxyDelegate* proxy_delegate,
     NetLog* net_log)
     : transport_pool_(transport_pool),
       ssl_pool_(ssl_pool),
       host_resolver_(host_resolver),
-      proxy_delegate_(proxy_delegate),
       net_log_(net_log) {
   base::TimeDelta max_pool_timeout = base::TimeDelta();
 
@@ -430,7 +426,6 @@ HttpProxyClientSocketPool::HttpProxyConnectJobFactory::NewConnectJob(
                                                         ConnectionTimeout(),
                                                         transport_pool_,
                                                         ssl_pool_,
-                                                        host_resolver_,
                                                         delegate,
                                                         net_log_));
 }
@@ -448,7 +443,6 @@ HttpProxyClientSocketPool::HttpProxyClientSocketPool(
     HostResolver* host_resolver,
     TransportClientSocketPool* transport_pool,
     SSLClientSocketPool* ssl_pool,
-    const ProxyDelegate* proxy_delegate,
     NetLog* net_log)
     : transport_pool_(transport_pool),
       ssl_pool_(ssl_pool),
@@ -458,7 +452,6 @@ HttpProxyClientSocketPool::HttpProxyClientSocketPool(
             new HttpProxyConnectJobFactory(transport_pool,
                                            ssl_pool,
                                            host_resolver,
-                                           proxy_delegate,
                                            net_log)) {
   // We should always have a |transport_pool_| except in unit tests.
   if (transport_pool_)
diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h
index 8bdbfc2..b42f628 100644
--- a/net/http/http_proxy_client_socket_pool.h
+++ b/net/http/http_proxy_client_socket_pool.h
@@ -108,7 +108,6 @@ class HttpProxyConnectJob : public ConnectJob {
                       const base::TimeDelta& timeout_duration,
                       TransportClientSocketPool* transport_pool,
                       SSLClientSocketPool* ssl_pool,
-                      HostResolver* host_resolver,
                       Delegate* delegate,
                       NetLog* net_log);
   ~HttpProxyConnectJob() override;
@@ -164,7 +163,6 @@ class HttpProxyConnectJob : public ConnectJob {
   scoped_refptr<HttpProxySocketParams> params_;
   TransportClientSocketPool* const transport_pool_;
   SSLClientSocketPool* const ssl_pool_;
-  HostResolver* const resolver_;
 
   State next_state_;
   CompletionCallback callback_;
@@ -196,7 +194,6 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
       HostResolver* host_resolver,
       TransportClientSocketPool* transport_pool,
       SSLClientSocketPool* ssl_pool,
-      const ProxyDelegate* proxy_delegate,
       NetLog* net_log);
 
   ~HttpProxyClientSocketPool() override;
@@ -260,7 +257,6 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
         TransportClientSocketPool* transport_pool,
         SSLClientSocketPool* ssl_pool,
         HostResolver* host_resolver,
-        const ProxyDelegate* proxy_delegate,
         NetLog* net_log);
 
     // ClientSocketPoolBase::ConnectJobFactory methods.
@@ -275,7 +271,6 @@ class NET_EXPORT_PRIVATE HttpProxyClientSocketPool
     TransportClientSocketPool* const transport_pool_;
     SSLClientSocketPool* const ssl_pool_;
     HostResolver* const host_resolver_;
-    const ProxyDelegate* proxy_delegate_;
     NetLog* net_log_;
     base::TimeDelta timeout_;
 
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index 909da62..cef53e9 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -189,7 +189,6 @@ class HttpProxyClientSocketPoolTest
               NULL,
               &transport_socket_pool_,
               &ssl_socket_pool_,
-              NULL,
               NULL) {}
 
   virtual ~HttpProxyClientSocketPoolTest() {
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index beac733..ff07a0e 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -387,12 +387,19 @@ CapturePreconnectsSocketPool<ParentPool>::CapturePreconnectsSocketPool(
     : ParentPool(0, 0, nullptr, host_resolver, nullptr, nullptr),
       last_num_streams_(-1) {}
 
-template<>
+template <>
 CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool(
-    HostResolver* host_resolver, CertVerifier* /* cert_verifier */)
-    : HttpProxyClientSocketPool(
-          0, 0, nullptr, host_resolver, nullptr, nullptr, nullptr, nullptr),
-      last_num_streams_(-1) {}
+    HostResolver* host_resolver,
+    CertVerifier* /* cert_verifier */)
+    : HttpProxyClientSocketPool(0,
+                                0,
+                                nullptr,
+                                host_resolver,
+                                nullptr,
+                                nullptr,
+                                nullptr),
+      last_num_streams_(-1) {
+}
 
 template <>
 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool(
diff --git a/net/proxy/proxy_script_decider.cc b/net/proxy/proxy_script_decider.cc
index 47e6ca8..00b9119 100644
--- a/net/proxy/proxy_script_decider.cc
+++ b/net/proxy/proxy_script_decider.cc
@@ -80,14 +80,12 @@ ProxyScriptDecider::ProxyScriptDecider(
     ProxyScriptFetcher* proxy_script_fetcher,
     DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher,
     NetLog* net_log)
-    : resolver_(NULL),
-      proxy_script_fetcher_(proxy_script_fetcher),
+    : proxy_script_fetcher_(proxy_script_fetcher),
       dhcp_proxy_script_fetcher_(dhcp_proxy_script_fetcher),
       current_pac_source_index_(0u),
       pac_mandatory_(false),
       next_state_(STATE_NONE),
-      net_log_(BoundNetLog::Make(
-          net_log, NetLog::SOURCE_PROXY_SCRIPT_DECIDER)),
+      net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_PROXY_SCRIPT_DECIDER)),
       fetch_pac_bytes_(false),
       quick_check_enabled_(true) {
   if (proxy_script_fetcher &&
diff --git a/net/proxy/proxy_script_decider.h b/net/proxy/proxy_script_decider.h
index d579080..99bb995 100644
--- a/net/proxy/proxy_script_decider.h
+++ b/net/proxy/proxy_script_decider.h
@@ -160,7 +160,6 @@ class NET_EXPORT_PRIVATE ProxyScriptDecider {
   void DidComplete();
   void Cancel();
 
-  ProxyResolver* resolver_;
   ProxyScriptFetcher* proxy_script_fetcher_;
   DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher_;
 
diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc
index 190023c..2a8caf5 100644
--- a/net/socket/client_socket_pool_manager_impl.cc
+++ b/net/socket/client_socket_pool_manager_impl.cc
@@ -44,10 +44,8 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
     CTVerifier* cert_transparency_verifier,
     CertPolicyEnforcer* cert_policy_enforcer,
     const std::string& ssl_session_cache_shard,
-    ProxyService* proxy_service,
     SSLConfigService* ssl_config_service,
     bool enable_ssl_connect_job_waiting,
-    ProxyDelegate* proxy_delegate,
     HttpNetworkSession::SocketPoolType pool_type)
     : net_log_(net_log),
       socket_factory_(socket_factory),
@@ -58,7 +56,6 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
       cert_transparency_verifier_(cert_transparency_verifier),
       cert_policy_enforcer_(cert_policy_enforcer),
       ssl_session_cache_shard_(ssl_session_cache_shard),
-      proxy_service_(proxy_service),
       ssl_config_service_(ssl_config_service),
       enable_ssl_connect_job_waiting_(enable_ssl_connect_job_waiting),
       pool_type_(pool_type),
@@ -102,8 +99,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
       transport_for_https_proxy_pool_histograms_("TCPforHTTPSProxy"),
       ssl_for_https_proxy_pool_histograms_("SSLforHTTPSProxy"),
       http_proxy_pool_histograms_("HTTPProxy"),
-      ssl_socket_pool_for_proxies_histograms_("SSLForProxies"),
-      proxy_delegate_(proxy_delegate) {
+      ssl_socket_pool_for_proxies_histograms_("SSLForProxies") {
   CertDatabase::GetInstance()->AddObserver(this);
 }
 
@@ -324,7 +320,6 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
                   host_resolver_,
                   tcp_http_ret.first->second,
                   ssl_https_ret.first->second,
-                  proxy_delegate_,
                   net_log_)));
 
   return ret.first->second;
diff --git a/net/socket/client_socket_pool_manager_impl.h b/net/socket/client_socket_pool_manager_impl.h
index ca609d5..515b1e1 100644
--- a/net/socket/client_socket_pool_manager_impl.h
+++ b/net/socket/client_socket_pool_manager_impl.h
@@ -28,8 +28,6 @@ class CTVerifier;
 class HttpProxyClientSocketPool;
 class HostResolver;
 class NetLog;
-class ProxyDelegate;
-class ProxyService;
 class SOCKSClientSocketPool;
 class SSLClientSocketPool;
 class SSLConfigService;
@@ -67,10 +65,8 @@ class ClientSocketPoolManagerImpl : public base::NonThreadSafe,
                               CTVerifier* cert_transparency_verifier,
                               CertPolicyEnforcer* cert_policy_enforcer,
                               const std::string& ssl_session_cache_shard,
-                              ProxyService* proxy_service,
                               SSLConfigService* ssl_config_service,
                               bool enable_ssl_connect_job_waiting,
-                              ProxyDelegate* proxy_delegate,
                               HttpNetworkSession::SocketPoolType pool_type);
   ~ClientSocketPoolManagerImpl() override;
 
@@ -117,7 +113,6 @@ class ClientSocketPoolManagerImpl : public base::NonThreadSafe,
   CTVerifier* const cert_transparency_verifier_;
   CertPolicyEnforcer* const cert_policy_enforcer_;
   const std::string ssl_session_cache_shard_;
-  ProxyService* const proxy_service_;
   const scoped_refptr<SSLConfigService> ssl_config_service_;
   bool enable_ssl_connect_job_waiting_;
   const HttpNetworkSession::SocketPoolType pool_type_;
@@ -151,8 +146,6 @@ class ClientSocketPoolManagerImpl : public base::NonThreadSafe,
   ClientSocketPoolHistograms ssl_socket_pool_for_proxies_histograms_;
   SSLSocketPoolMap ssl_socket_pools_for_proxies_;
 
-  const ProxyDelegate* proxy_delegate_;
-
   DISALLOW_COPY_AND_ASSIGN(ClientSocketPoolManagerImpl);
 };
 
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index c3b98b8..0e75a20 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -177,7 +177,6 @@ SSLConnectJob::SSLConnectJob(const std::string& group_name,
                              SOCKSClientSocketPool* socks_pool,
                              HttpProxyClientSocketPool* http_proxy_pool,
                              ClientSocketFactory* client_socket_factory,
-                             HostResolver* host_resolver,
                              const SSLClientSocketContext& context,
                              const GetMessengerCallback& get_messenger_callback,
                              Delegate* delegate,
@@ -192,7 +191,6 @@ SSLConnectJob::SSLConnectJob(const std::string& group_name,
       socks_pool_(socks_pool),
       http_proxy_pool_(http_proxy_pool),
       client_socket_factory_(client_socket_factory),
-      host_resolver_(host_resolver),
       context_(context.cert_verifier,
                context.channel_id_service,
                context.transport_security_state,
@@ -700,7 +698,6 @@ scoped_ptr<ConnectJob> SSLClientSocketPool::SSLConnectJobFactory::NewConnectJob(
                                                   socks_pool_,
                                                   http_proxy_pool_,
                                                   client_socket_factory_,
-                                                  host_resolver_,
                                                   context_,
                                                   get_messenger_callback_,
                                                   delegate,
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
index 59e754a..7556488 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -190,7 +190,6 @@ class SSLConnectJob : public ConnectJob {
                 SOCKSClientSocketPool* socks_pool,
                 HttpProxyClientSocketPool* http_proxy_pool,
                 ClientSocketFactory* client_socket_factory,
-                HostResolver* host_resolver,
                 const SSLClientSocketContext& context,
                 const GetMessengerCallback& get_messenger_callback,
                 Delegate* delegate,
@@ -250,7 +249,6 @@ class SSLConnectJob : public ConnectJob {
   SOCKSClientSocketPool* const socks_pool_;
   HttpProxyClientSocketPool* const http_proxy_pool_;
   ClientSocketFactory* const client_socket_factory_;
-  HostResolver* const host_resolver_;
 
   const SSLClientSocketContext context_;
 
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 1e4a14f..0131a5f 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -132,7 +132,6 @@ class SSLClientSocketPoolTest
                                 &host_resolver_,
                                 &transport_socket_pool_,
                                 NULL,
-                                NULL,
                                 NULL),
         enable_ssl_connect_job_waiting_(false) {
     scoped_refptr<SSLConfigService> ssl_config_service(
diff --git a/net/spdy/spdy_buffer.cc b/net/spdy/spdy_buffer.cc
index c1a602e..f7cd378 100644
--- a/net/spdy/spdy_buffer.cc
+++ b/net/spdy/spdy_buffer.cc
@@ -41,8 +41,7 @@ class SpdyBuffer::SharedFrameIOBuffer : public IOBuffer {
   SharedFrameIOBuffer(const scoped_refptr<SharedFrame>& shared_frame,
                       size_t offset)
       : IOBuffer(shared_frame->data->data() + offset),
-        shared_frame_(shared_frame),
-        offset_(offset) {}
+        shared_frame_(shared_frame) {}
 
  private:
   ~SharedFrameIOBuffer() override {
@@ -51,7 +50,6 @@ class SpdyBuffer::SharedFrameIOBuffer : public IOBuffer {
   }
 
   const scoped_refptr<SharedFrame> shared_frame_;
-  const size_t offset_;
 
   DISALLOW_COPY_AND_ASSIGN(SharedFrameIOBuffer);
 };
diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc
index a1540fa..9fc963d 100644
--- a/net/url_request/url_request_job_manager.cc
+++ b/net/url_request/url_request_job_manager.cc
@@ -150,9 +150,7 @@ bool URLRequestJobManager::SupportsScheme(const std::string& scheme) {
   return false;
 }
 
-URLRequestJobManager::URLRequestJobManager()
-    : allowed_thread_(0),
-      allowed_thread_initialized_(false) {
+URLRequestJobManager::URLRequestJobManager() {
 }
 
 URLRequestJobManager::~URLRequestJobManager() {}
diff --git a/net/url_request/url_request_job_manager.h b/net/url_request/url_request_job_manager.h
index 6329eab..7729abb 100644
--- a/net/url_request/url_request_job_manager.h
+++ b/net/url_request/url_request_job_manager.h
@@ -6,10 +6,8 @@
 #define NET_URL_REQUEST_URL_REQUEST_JOB_MANAGER_H_
 
 #include <string>
-#include <vector>
 
-#include "base/synchronization/lock.h"
-#include "base/threading/platform_thread.h"
+#include "base/threading/thread_checker.h"
 #include "net/base/net_export.h"
 #include "net/url_request/url_request.h"
 
@@ -64,11 +62,12 @@ class NET_EXPORT URLRequestJobManager {
   // set the allowed thread.
   bool IsAllowedThread() const {
 #if 0
-    if (!allowed_thread_initialized_) {
-      allowed_thread_ = base::PlatformThread::CurrentId();
-      allowed_thread_initialized_ = true;
-    }
-    return allowed_thread_ == base::PlatformThread::CurrentId();
+    return thread_checker_.CalledOnValidThread();
+  }
+
+  // We use this to assert that CreateJob and the registration functions all
+  // run on the same thread.
+  base::ThreadChecker thread_checker_;
 #else
     // The previous version of this check used GetCurrentThread on Windows to
     // get thread handles to compare. Unfortunately, GetCurrentThread returns
@@ -80,15 +79,8 @@ class NET_EXPORT URLRequestJobManager {
     // check back on.
     return true;
   }
-
-  // We use this to assert that CreateJob and the registration functions all
-  // run on the same thread.
-  mutable base::PlatformThreadId allowed_thread_;
-  mutable bool allowed_thread_initialized_;
 #endif
 
-  mutable base::Lock lock_;
-
   DISALLOW_COPY_AND_ASSIGN(URLRequestJobManager);
 };