diff --git a/net/base/filter.cc b/net/base/filter.cc index e4dbefdd0970d7..36d301426f9c6b 100644 --- a/net/base/filter.cc +++ b/net/base/filter.cc @@ -322,9 +322,7 @@ Filter::Filter() stream_buffer_size_(0), next_stream_data_(NULL), stream_data_len_(0), - next_filter_(NULL), - last_status_(FILTER_NEED_MORE_DATA) { -} + last_status_(FILTER_NEED_MORE_DATA) {} Filter::FilterStatus Filter::CopyOut(char* dest_buffer, int* dest_len) { int out_len; diff --git a/net/base/sdch_filter.cc b/net/base/sdch_filter.cc index 6728601b41ede4..89891b66f4951f 100644 --- a/net/base/sdch_filter.cc +++ b/net/base/sdch_filter.cc @@ -19,7 +19,6 @@ namespace net { SdchFilter::SdchFilter(const FilterContext& filter_context) : filter_context_(filter_context), decoding_status_(DECODING_UNINITIALIZED), - vcdiff_streaming_decoder_(NULL), dictionary_hash_(), dictionary_hash_is_plausible_(false), dictionary_(NULL), diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc index 884522ed09f6ce..6563cbfb3a2ea9 100644 --- a/net/disk_cache/simple/simple_index_file.cc +++ b/net/disk_cache/simple/simple_index_file.cc @@ -173,7 +173,7 @@ scoped_ptr SimpleIndexFile::LoadFromDisk( std::string contents; if(!file_util::ReadFileToString(index_filename, &contents)) { LOG(WARNING) << "Could not read Simple Index file."; - return scoped_ptr(NULL); + return scoped_ptr(); } return SimpleIndexFile::Deserialize(contents.data(), contents.size()); @@ -186,7 +186,7 @@ scoped_ptr SimpleIndexFile::Deserialize(const char* data, Pickle pickle(data, data_len); if (!pickle.data()) { LOG(WARNING) << "Corrupt Simple Index File."; - return scoped_ptr(NULL); + return scoped_ptr(); } PickleIterator pickle_it(pickle); @@ -198,18 +198,18 @@ scoped_ptr SimpleIndexFile::Deserialize(const char* data, if (crc_read != crc_calculated) { LOG(WARNING) << "Invalid CRC in Simple Index file."; - return scoped_ptr(NULL); + return scoped_ptr(); } SimpleIndexFile::IndexMetadata index_metadata; if (!index_metadata.Deserialize(&pickle_it)) { LOG(ERROR) << "Invalid index_metadata on Simple Cache Index."; - return scoped_ptr(NULL); + return scoped_ptr(); } if (!index_metadata.CheckIndexMetadata()) { LOG(ERROR) << "Invalid index_metadata on Simple Cache Index."; - return scoped_ptr(NULL); + return scoped_ptr(); } scoped_ptr index_file_entries( @@ -220,7 +220,7 @@ scoped_ptr SimpleIndexFile::Deserialize(const char* data, if (!pickle_it.ReadUInt64(&hash_key) || !entry_metadata.Deserialize(&pickle_it)) { LOG(WARNING) << "Invalid EntryMetadata in Simple Index file."; - return scoped_ptr(NULL); + return scoped_ptr(); } SimpleIndex::InsertInEntrySet( hash_key, entry_metadata, index_file_entries.get()); diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc index 2e6d0c957b597c..35772124cc513e 100644 --- a/net/dns/dns_session.cc +++ b/net/dns/dns_session.cc @@ -229,7 +229,8 @@ scoped_ptr DnsSession::AllocateSocket( scoped_ptr socket; socket = socket_pool_->AllocateSocket(server_index); - if (!socket.get()) return scoped_ptr(NULL); + if (!socket.get()) + return scoped_ptr(); socket->NetLog().BeginEvent(NetLog::TYPE_SOCKET_IN_USE, source.ToEventParametersCallback()); diff --git a/net/dns/dns_socket_pool.cc b/net/dns/dns_socket_pool.cc index cc6552eea29b14..64570fca8fc83e 100644 --- a/net/dns/dns_socket_pool.cc +++ b/net/dns/dns_socket_pool.cc @@ -187,7 +187,7 @@ scoped_ptr DefaultDnsSocketPool::AllocateSocket( FillPool(server_index, kAllocateMinSize); if (pool.size() == 0) { LOG(WARNING) << "No DNS sockets available in pool " << server_index << "!"; - return scoped_ptr(NULL); + return scoped_ptr(); } if (pool.size() < kAllocateMinSize) { diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index f7c1cab50db72b..ee790057c24d32 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc @@ -330,7 +330,7 @@ class TransactionHelper { class DnsTransactionTest : public testing::Test { public: - DnsTransactionTest() : socket_factory_(NULL) {} + DnsTransactionTest() {} // Generates |nameservers| for DnsConfig. void ConfigureNumServers(unsigned num_servers) { diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc index 287e97d4c5172a..ccd6e2ef3b1693 100644 --- a/net/ftp/ftp_network_transaction.cc +++ b/net/ftp/ftp_network_transaction.cc @@ -212,7 +212,6 @@ FtpNetworkTransaction::FtpNetworkTransaction( request_(NULL), resolver_(session->host_resolver()), read_ctrl_buf_(new IOBuffer(kCtrlBufLen)), - ctrl_response_buffer_(NULL), read_data_buf_len_(0), last_error_(OK), system_type_(SYSTEM_TYPE_UNKNOWN), @@ -224,8 +223,7 @@ FtpNetworkTransaction::FtpNetworkTransaction( data_connection_port_(0), socket_factory_(socket_factory), next_state_(STATE_NONE), - state_after_data_connect_complete_(STATE_CTRL_WRITE_SIZE) { -} + state_after_data_connect_complete_(STATE_CTRL_WRITE_SIZE) {} FtpNetworkTransaction::~FtpNetworkTransaction() { } diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc index 85454fb7e7bf38..21f5d65f1f2156 100644 --- a/net/http/http_auth_handler_negotiate.cc +++ b/net/http/http_auth_handler_negotiate.cc @@ -27,8 +27,7 @@ HttpAuthHandlerNegotiate::Factory::Factory() max_token_length_(0), first_creation_(true), #endif - is_unsupported_(false), - auth_library_(NULL) { + is_unsupported_(false) { } HttpAuthHandlerNegotiate::Factory::~Factory() { diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index bf2e0f3e11db0e..90c6e1ef527cb4 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -175,7 +175,6 @@ HttpCache::Transaction::Transaction( cache_(cache->AsWeakPtr()), entry_(NULL), new_entry_(NULL), - network_trans_(NULL), new_response_(NULL), mode_(NONE), target_state_(STATE_NONE), @@ -194,8 +193,8 @@ HttpCache::Transaction::Transaction( effective_load_flags_(0), write_len_(0), weak_factory_(this), - io_callback_(base::Bind( - &Transaction::OnIOComplete, weak_factory_.GetWeakPtr())), + io_callback_(base::Bind(&Transaction::OnIOComplete, + weak_factory_.GetWeakPtr())), transaction_pattern_(PATTERN_UNDEFINED), defer_cache_sensitivity_delay_(false), transaction_delegate_(transaction_delegate) { diff --git a/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc b/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc index ae89dbce3bf729..f6558eda7e64ba 100644 --- a/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc @@ -89,16 +89,13 @@ class HttpProxyClientSocketPoolSpdy2Test : public TestWithHttpParam { session_(CreateNetworkSession()), http_proxy_histograms_("HttpProxyUnitTest"), spdy_util_(kProtoSPDY2), - ssl_data_(NULL), - data_(NULL), pool_(kMaxSockets, kMaxSocketsPerGroup, &http_proxy_histograms_, NULL, &transport_socket_pool_, &ssl_socket_pool_, - NULL) { - } + NULL) {} virtual ~HttpProxyClientSocketPoolSpdy2Test() { } diff --git a/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc b/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc index 3a1acc86e6184b..167cd3f74d7f0c 100644 --- a/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc @@ -89,16 +89,13 @@ class HttpProxyClientSocketPoolSpdy3Test : public TestWithHttpParam { session_(CreateNetworkSession()), http_proxy_histograms_("HttpProxyUnitTest"), spdy_util_(kProtoSPDY3), - ssl_data_(NULL), - data_(NULL), pool_(kMaxSockets, kMaxSocketsPerGroup, &http_proxy_histograms_, NULL, &transport_socket_pool_, &ssl_socket_pool_, - NULL) { - } + NULL) {} virtual ~HttpProxyClientSocketPoolSpdy3Test() { } diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc index fbfc101fa312af..4bec46f1c7ac60 100644 --- a/net/http/http_stream_parser.cc +++ b/net/http/http_stream_parser.cc @@ -180,7 +180,6 @@ HttpStreamParser::HttpStreamParser(ClientSocketHandle* connection, response_header_start_offset_(-1), response_body_length_(-1), response_body_read_(0), - chunked_decoder_(NULL), user_read_buf_(NULL), user_read_buf_len_(0), connection_(connection), diff --git a/net/http/http_transaction_unittest.cc b/net/http/http_transaction_unittest.cc index c28903a34cd82d..0abef0839a18ea 100644 --- a/net/http/http_transaction_unittest.cc +++ b/net/http/http_transaction_unittest.cc @@ -155,9 +155,7 @@ int TestTransactionConsumer::quit_counter_ = 0; TestTransactionConsumer::TestTransactionConsumer( net::RequestPriority priority, net::HttpTransactionFactory* factory) - : state_(IDLE), - trans_(NULL), - error_(net::OK) { + : state_(IDLE), error_(net::OK) { // Disregard the error code. factory->CreateTransaction(priority, &trans_, NULL); ++quit_counter_; diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc index 2c8d53d5790bd8..50e1d9f25fab6b 100644 --- a/net/proxy/proxy_script_fetcher_impl.cc +++ b/net/proxy/proxy_script_fetcher_impl.cc @@ -77,7 +77,6 @@ ProxyScriptFetcherImpl::ProxyScriptFetcherImpl( url_request_context_(url_request_context), buf_(new IOBuffer(kBufSize)), next_id_(0), - cur_request_(NULL), cur_request_id_(0), result_code_(OK), result_text_(NULL), diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc index 303571b05c45b6..ca4d3cb56e3d4d 100644 --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc @@ -152,9 +152,7 @@ int QuicStreamFactory::Job::DoResolveHostComplete(int rv) { } QuicStreamRequest::QuicStreamRequest(QuicStreamFactory* factory) - : factory_(factory), - stream_(NULL){ -} + : factory_(factory) {} QuicStreamRequest::~QuicStreamRequest() { if (factory_ && !callback_.is_null()) @@ -299,7 +297,7 @@ scoped_ptr QuicStreamFactory::CreateIfSessionExists( const HostPortProxyPair& host_port_proxy_pair, const BoundNetLog& net_log) { if (!HasActiveSession(host_port_proxy_pair)) { - return scoped_ptr(NULL); + return scoped_ptr(); } QuicClientSession* session = active_sessions_[host_port_proxy_pair]; diff --git a/net/socket/deterministic_socket_data_unittest.cc b/net/socket/deterministic_socket_data_unittest.cc index b97cd408eb381b..eba01b5e9cc956 100644 --- a/net/socket/deterministic_socket_data_unittest.cc +++ b/net/socket/deterministic_socket_data_unittest.cc @@ -68,7 +68,6 @@ class DeterministicSocketDataTest : public PlatformTest { DeterministicSocketDataTest::DeterministicSocketDataTest() : sock_(NULL), - data_(NULL), read_buf_(NULL), connect_data_(SYNCHRONOUS, OK), endpoint_("www.google.com", 443), diff --git a/net/socket/tcp_listen_socket_unittest.cc b/net/socket/tcp_listen_socket_unittest.cc index 19dd658f8e1ecb..d13b784cbdcef3 100644 --- a/net/socket/tcp_listen_socket_unittest.cc +++ b/net/socket/tcp_listen_socket_unittest.cc @@ -24,12 +24,7 @@ static const char kLoopback[] = "127.0.0.1"; static const int kDefaultTimeoutMs = 5000; TCPListenSocketTester::TCPListenSocketTester() - : thread_(NULL), - loop_(NULL), - server_(NULL), - connection_(NULL), - cv_(&lock_) { -} + : loop_(NULL), server_(NULL), connection_(NULL), cv_(&lock_) {} void TCPListenSocketTester::SetUp() { base::Thread::Options options; diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc index fe626de26efa72..0e7da9a76af63c 100644 --- a/net/spdy/spdy_proxy_client_socket_unittest.cc +++ b/net/spdy/spdy_proxy_client_socket_unittest.cc @@ -140,8 +140,6 @@ INSTANTIATE_TEST_CASE_P(NextProto, SpdyProxyClientSocketTest::SpdyProxyClientSocketTest() : spdy_util_(GetParam()), - sock_(NULL), - data_(NULL), session_(NULL), read_buf_(NULL), session_deps_(GetParam()), @@ -153,7 +151,8 @@ SpdyProxyClientSocketTest::SpdyProxyClientSocketTest() proxy_host_port_(kProxyHost, kProxyPort), endpoint_host_port_pair_(kOriginHost, kOriginPort), proxy_(ProxyServer::SCHEME_HTTPS, proxy_host_port_), - endpoint_spdy_session_key_(endpoint_host_port_pair_, proxy_, + endpoint_spdy_session_key_(endpoint_host_port_pair_, + proxy_, kPrivacyModeDisabled), transport_params_(new TransportSocketParams(proxy_host_port_, LOWEST, diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc index aef1db4e3959ec..bf55539e37cad3 100644 --- a/net/test/embedded_test_server/embedded_test_server.cc +++ b/net/test/embedded_test_server/embedded_test_server.cc @@ -43,7 +43,7 @@ scoped_ptr HandleFileRequest( std::string file_contents; if (!file_util::ReadFileToString( server_root.AppendASCII(request_path), &file_contents)) { - return scoped_ptr(NULL); + return scoped_ptr(); } scoped_ptr http_response(new BasicHttpResponse); diff --git a/net/url_request/url_fetcher_core.cc b/net/url_request/url_fetcher_core.cc index d2e0c5accd9b8a..24d03dd1c14f1f 100644 --- a/net/url_request/url_fetcher_core.cc +++ b/net/url_request/url_fetcher_core.cc @@ -69,9 +69,7 @@ URLFetcherCore::URLFetcherCore(URLFetcher* fetcher, original_url_(original_url), request_type_(request_type), delegate_(d), - delegate_task_runner_( - base::ThreadTaskRunnerHandle::Get()), - request_(NULL), + delegate_task_runner_(base::ThreadTaskRunnerHandle::Get()), load_flags_(LOAD_NORMAL), response_code_(URLFetcher::RESPONSE_CODE_INVALID), buffer_(new IOBuffer(kBufferSize)), diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc index 9f315800b26e92..d2f2acae08883c 100644 --- a/net/url_request/url_fetcher_impl_unittest.cc +++ b/net/url_request/url_fetcher_impl_unittest.cc @@ -82,10 +82,7 @@ class ThrottlingTestURLRequestContextGetter class URLFetcherTest : public testing::Test, public URLFetcherDelegate { public: - URLFetcherTest() - : fetcher_(NULL), - context_(NULL) { - } + URLFetcherTest() : fetcher_(NULL) {} static int GetNumFetcherCores() { return URLFetcherImpl::GetNumFetcherCores(); diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index df6ac9b954c326..6e0ee73208b837 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -222,7 +222,6 @@ URLRequestJob* URLRequestHttpJob::Factory(URLRequest* request, request->context()->http_user_agent_settings()); } - URLRequestHttpJob::URLRequestHttpJob( URLRequest* request, NetworkDelegate* network_delegate, @@ -233,13 +232,12 @@ URLRequestHttpJob::URLRequestHttpJob( response_cookies_save_index_(0), proxy_auth_state_(AUTH_STATE_DONT_NEED_AUTH), server_auth_state_(AUTH_STATE_DONT_NEED_AUTH), - start_callback_(base::Bind( - &URLRequestHttpJob::OnStartCompleted, base::Unretained(this))), - notify_before_headers_sent_callback_(base::Bind( - &URLRequestHttpJob::NotifyBeforeSendHeadersCallback, - base::Unretained(this))), + start_callback_(base::Bind(&URLRequestHttpJob::OnStartCompleted, + base::Unretained(this))), + notify_before_headers_sent_callback_( + base::Bind(&URLRequestHttpJob::NotifyBeforeSendHeadersCallback, + base::Unretained(this))), read_in_progress_(false), - transaction_(NULL), throttling_entry_(NULL), sdch_dictionary_advertised_(false), sdch_test_activated_(false), @@ -253,12 +251,12 @@ URLRequestHttpJob::URLRequestHttpJob( final_packet_time_(), filter_context_(new HttpFilterContext(this)), weak_factory_(this), - on_headers_received_callback_(base::Bind( - &URLRequestHttpJob::OnHeadersReceivedCallback, - base::Unretained(this))), + on_headers_received_callback_( + base::Bind(&URLRequestHttpJob::OnHeadersReceivedCallback, + base::Unretained(this))), awaiting_callback_(false), - http_transaction_delegate_(new HttpTransactionDelegateImpl( - request, network_delegate)), + http_transaction_delegate_( + new HttpTransactionDelegateImpl(request, network_delegate)), http_user_agent_settings_(http_user_agent_settings) { URLRequestThrottlerManager* manager = request->context()->throttler_manager(); if (manager)