summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/base/cert_verifier.cc2
-rw-r--r--net/base/crl_filter.cc2
-rw-r--r--net/base/dnsrr_resolver.cc2
-rw-r--r--net/base/host_cache_unittest.cc2
-rw-r--r--net/base/host_resolver_impl.cc2
-rw-r--r--net/base/net_util.cc2
-rw-r--r--net/base/test_root_certs_nss.cc2
-rw-r--r--net/ftp/ftp_directory_listing_parser.cc2
-rw-r--r--net/http/http_alternate_protocols.cc2
-rw-r--r--net/http/http_auth_handler_factory.cc2
-rw-r--r--net/http/http_cache.cc2
-rw-r--r--net/http/http_network_session.cc2
-rw-r--r--net/http/http_network_transaction.cc2
-rw-r--r--net/http/http_stream_factory_impl.cc2
-rw-r--r--net/http/http_stream_factory_impl_job.cc2
-rw-r--r--net/http/http_stream_factory_impl_request.cc2
-rw-r--r--net/ocsp/nss_ocsp.cc2
-rw-r--r--net/proxy/multi_threaded_proxy_resolver_unittest.cc2
-rw-r--r--net/proxy/proxy_bypass_rules.cc2
-rw-r--r--net/proxy/proxy_config_service_win.cc2
-rw-r--r--net/socket/client_socket_pool_base.cc2
-rw-r--r--net/socket/client_socket_pool_manager.h2
-rw-r--r--net/socket/ssl_client_socket_win.cc2
-rw-r--r--net/spdy/spdy_session.cc2
-rw-r--r--net/udp/udp_socket_unittest.cc2
-rw-r--r--net/url_request/url_request_job_factory.cc2
26 files changed, 26 insertions, 26 deletions
diff --git a/net/base/cert_verifier.cc b/net/base/cert_verifier.cc
index 2644c39..9282162 100644
--- a/net/base/cert_verifier.cc
+++ b/net/base/cert_verifier.cc
@@ -6,7 +6,7 @@
#include "base/compiler_specific.h"
#include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/synchronization/lock.h"
#include "base/threading/worker_pool.h"
#include "net/base/net_errors.h"
diff --git a/net/base/crl_filter.cc b/net/base/crl_filter.cc
index fe9d336..d438cc7 100644
--- a/net/base/crl_filter.cc
+++ b/net/base/crl_filter.cc
@@ -5,7 +5,7 @@
#include "base/base64.h"
#include "base/json/json_reader.h"
#include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/values.h"
#include "crypto/sha2.h"
#include "net/base/crl_filter.h"
diff --git a/net/base/dnsrr_resolver.cc b/net/base/dnsrr_resolver.cc
index 81f9111..2cfb0cf 100644
--- a/net/base/dnsrr_resolver.cc
+++ b/net/base/dnsrr_resolver.cc
@@ -15,7 +15,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_piece.h"
#include "base/synchronization/lock.h"
#include "base/task.h"
diff --git a/net/base/host_cache_unittest.cc b/net/base/host_cache_unittest.cc
index e534695..4c99688 100644
--- a/net/base/host_cache_unittest.cc
+++ b/net/base/host_cache_unittest.cc
@@ -5,7 +5,7 @@
#include "net/base/host_cache.h"
#include "base/format_macros.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "net/base/net_errors.h"
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc
index 4898d9e..4c367a1 100644
--- a/net/base/host_resolver_impl.cc
+++ b/net/base/host_resolver_impl.cc
@@ -21,7 +21,7 @@
#include "base/message_loop_proxy.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/task.h"
#include "base/threading/worker_pool.h"
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 25c0633..097da23 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -45,7 +45,7 @@
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/path_service.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_piece.h"
#include "base/string_split.h"
diff --git a/net/base/test_root_certs_nss.cc b/net/base/test_root_certs_nss.cc
index 70c8133..3783265 100644
--- a/net/base/test_root_certs_nss.cc
+++ b/net/base/test_root_certs_nss.cc
@@ -7,7 +7,7 @@
#include <cert.h>
#include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "crypto/nss_util.h"
#include "net/base/x509_certificate.h"
diff --git a/net/ftp/ftp_directory_listing_parser.cc b/net/ftp/ftp_directory_listing_parser.cc
index dbb12ce..605abb8 100644
--- a/net/ftp/ftp_directory_listing_parser.cc
+++ b/net/ftp/ftp_directory_listing_parser.cc
@@ -6,7 +6,7 @@
#include "base/i18n/icu_encoding_detection.h"
#include "base/i18n/icu_string_conversions.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_split.h"
#include "base/string_util.h"
#include "net/base/net_errors.h"
diff --git a/net/http/http_alternate_protocols.cc b/net/http/http_alternate_protocols.cc
index 28c52dc..42a6a9f 100644
--- a/net/http/http_alternate_protocols.cc
+++ b/net/http/http_alternate_protocols.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/stringprintf.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
namespace net {
diff --git a/net/http/http_auth_handler_factory.cc b/net/http/http_auth_handler_factory.cc
index 8cf7d3e..88916f9 100644
--- a/net/http/http_auth_handler_factory.cc
+++ b/net/http/http_auth_handler_factory.cc
@@ -4,7 +4,7 @@
#include "net/http/http_auth_handler_factory.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_util.h"
#include "net/base/net_errors.h"
#include "net/http/http_auth_filter.h"
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index cf533e8..157059df 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -17,7 +17,7 @@
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
#include "base/pickle.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 27d5cb9..9f738ec 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -8,7 +8,7 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/values.h"
#include "net/http/http_auth_handler_factory.h"
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index d856d02..7a10a1b 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -13,7 +13,7 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
#include "base/metrics/stats_counters.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc
index 63db456..dacc2fb 100644
--- a/net/http/http_stream_factory_impl.cc
+++ b/net/http/http_stream_factory_impl.cc
@@ -5,7 +5,7 @@
#include "net/http/http_stream_factory_impl.h"
#include "base/string_number_conversions.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_log.h"
#include "net/base/net_util.h"
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 8952668..417857b 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -5,7 +5,7 @@
#include "net/http/http_stream_factory_impl_job.h"
#include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/values.h"
diff --git a/net/http/http_stream_factory_impl_request.cc b/net/http/http_stream_factory_impl_request.cc
index d8bb09f..a97f46e 100644
--- a/net/http/http_stream_factory_impl_request.cc
+++ b/net/http/http_stream_factory_impl_request.cc
@@ -5,7 +5,7 @@
#include "net/http/http_stream_factory_impl_request.h"
#include "base/logging.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "net/http/http_stream_factory_impl_job.h"
#include "net/spdy/spdy_http_stream.h"
#include "net/spdy/spdy_session.h"
diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc
index 80e5413..ec24107 100644
--- a/net/ocsp/nss_ocsp.cc
+++ b/net/ocsp/nss_ocsp.cc
@@ -20,7 +20,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/synchronization/condition_variable.h"
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
index 8d2907c..2362ba4 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -5,7 +5,7 @@
#include "net/proxy/multi_threaded_proxy_resolver.h"
#include "base/message_loop.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/threading/platform_thread.h"
diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc
index df5109e..4674e25 100644
--- a/net/proxy/proxy_bypass_rules.cc
+++ b/net/proxy/proxy_bypass_rules.cc
@@ -4,7 +4,7 @@
#include "net/proxy/proxy_bypass_rules.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/stringprintf.h"
#include "base/string_number_conversions.h"
#include "base/string_tokenizer.h"
diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc
index 0334723..d57088d 100644
--- a/net/proxy/proxy_config_service_win.cc
+++ b/net/proxy/proxy_config_service_win.cc
@@ -11,7 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string_tokenizer.h"
#include "base/string_util.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/threading/thread_restrictions.h"
#include "base/win/registry.h"
#include "net/base/net_errors.h"
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index d39890b..24966c0 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/metrics/stats_counters.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/time.h"
diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h
index 27e6f03..5bf61e4 100644
--- a/net/socket/client_socket_pool_manager.h
+++ b/net/socket/client_socket_pool_manager.h
@@ -14,7 +14,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/template_util.h"
#include "base/threading/non_thread_safe.h"
#include "net/base/cert_database.h"
diff --git a/net/socket/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc
index ecdf8cf..a1a2396 100644
--- a/net/socket/ssl_client_socket_win.cc
+++ b/net/socket/ssl_client_socket_win.cc
@@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "base/lazy_instance.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/synchronization/lock.h"
#include "base/utf_string_conversions.h"
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 36288c7..a1e8afe 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -10,7 +10,7 @@
#include "base/message_loop.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/stats_counters.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc
index 9df38f6..bae3a87 100644
--- a/net/udp/udp_socket_unittest.cc
+++ b/net/udp/udp_socket_unittest.cc
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/bind.h"
#include "base/metrics/histogram.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "net/base/io_buffer.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
diff --git a/net/url_request/url_request_job_factory.cc b/net/url_request/url_request_job_factory.cc
index 8ef5876..f5ff25d 100644
--- a/net/url_request/url_request_job_factory.cc
+++ b/net/url_request/url_request_job_factory.cc
@@ -4,7 +4,7 @@
#include "net/url_request/url_request_job_factory.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
#include "googleurl/src/gurl.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_request_job_manager.h"