diff options
80 files changed, 84 insertions, 84 deletions
diff --git a/net/android/keystore.h b/net/android/keystore.h index 9ede4bf..f14fa87 100644 --- a/net/android/keystore.h +++ b/net/android/keystore.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/ssl/ssl_client_cert_type.h" diff --git a/net/base/big_endian.cc b/net/base/big_endian.cc index 17acc59..888cf35 100644 --- a/net/base/big_endian.cc +++ b/net/base/big_endian.cc @@ -4,7 +4,7 @@ #include "net/base/big_endian.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" namespace net { diff --git a/net/base/big_endian.h b/net/base/big_endian.h index cf2ee26..911f3c5 100644 --- a/net/base/big_endian.h +++ b/net/base/big_endian.h @@ -6,7 +6,7 @@ #define NET_BASE_BIG_ENDIAN_H_ #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" namespace net { diff --git a/net/base/big_endian_unittest.cc b/net/base/big_endian_unittest.cc index cb4a6d4..e758286 100644 --- a/net/base/big_endian_unittest.cc +++ b/net/base/big_endian_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/big_endian.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/base/dns_util.h b/net/base/dns_util.h index b653413..f0d9574 100644 --- a/net/base/dns_util.h +++ b/net/base/dns_util.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" namespace net { diff --git a/net/base/escape.cc b/net/base/escape.cc index d4371f8..f578275 100644 --- a/net/base/escape.cc +++ b/net/base/escape.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_piece.h" #include "base/strings/utf_offset_string_conversions.h" #include "base/utf_string_conversions.h" diff --git a/net/base/hash_value.h b/net/base/hash_value.h index fc8d163..aa0b9f6 100644 --- a/net/base/hash_value.h +++ b/net/base/hash_value.h @@ -11,7 +11,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "build/build_config.h" #include "net/base/net_export.h" diff --git a/net/base/keygen_handler_win.cc b/net/base/keygen_handler_win.cc index bbe86f0..730c0ee 100644 --- a/net/base/keygen_handler_win.cc +++ b/net/base/keygen_handler_win.cc @@ -17,8 +17,8 @@ #include "base/base64.h" #include "base/basictypes.h" #include "base/logging.h" -#include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_piece.h" #include "base/utf_string_conversions.h" #include "crypto/capi_util.h" #include "crypto/scoped_capi_types.h" diff --git a/net/base/net_module.h b/net/base/net_module.h index b2c768b..4ac8ab3 100644 --- a/net/base/net_module.h +++ b/net/base/net_module.h @@ -6,7 +6,7 @@ #define NET_BASE_NET_MODULE_H__ #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" namespace net { diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 18d00fe..a9e4d90 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -40,9 +40,9 @@ #include "base/path_service.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" #include "base/strings/sys_string_conversions.h" diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc index 8aa231f..48253d9 100644 --- a/net/base/net_util_win.cc +++ b/net/base/net_util_win.cc @@ -12,8 +12,8 @@ #include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" diff --git a/net/base/url_util.cc b/net/base/url_util.cc index 99dbbbe..39d6ec4 100644 --- a/net/base/url_util.cc +++ b/net/base/url_util.cc @@ -4,7 +4,7 @@ #include "net/base/url_util.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" diff --git a/net/cert/asn1_util.h b/net/cert/asn1_util.h index 9a10bee..ed379b3 100644 --- a/net/cert/asn1_util.h +++ b/net/cert/asn1_util.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" namespace net { diff --git a/net/cert/cert_verify_proc_mac.cc b/net/cert/cert_verify_proc_mac.cc index fe2fb9e..eafb551 100644 --- a/net/cert/cert_verify_proc_mac.cc +++ b/net/cert/cert_verify_proc_mac.cc @@ -15,7 +15,7 @@ #include "base/mac/mac_logging.h" #include "base/mac/scoped_cftyperef.h" #include "base/sha1.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/synchronization/lock.h" #include "crypto/mac_security_services_lock.h" #include "crypto/nss_util.h" diff --git a/net/cert/crl_set.h b/net/cert/crl_set.h index ae6a2a2..511654d 100644 --- a/net/cert/crl_set.h +++ b/net/cert/crl_set.h @@ -11,7 +11,7 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" namespace base { diff --git a/net/cert/pem_tokenizer.h b/net/cert/pem_tokenizer.h index 13d2817..bb41c44 100644 --- a/net/cert/pem_tokenizer.h +++ b/net/cert/pem_tokenizer.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" namespace net { diff --git a/net/cert/x509_cert_types.cc b/net/cert/x509_cert_types.cc index 04dbd6b..b5a2f2f 100644 --- a/net/cert/x509_cert_types.cc +++ b/net/cert/x509_cert_types.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/time.h" #include "net/cert/x509_certificate.h" diff --git a/net/cert/x509_cert_types.h b/net/cert/x509_cert_types.h index 4b17310..9960aa1 100644 --- a/net/cert/x509_cert_types.h +++ b/net/cert/x509_cert_types.h @@ -12,7 +12,7 @@ #include <vector> #include "base/logging.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "build/build_config.h" #include "net/base/hash_value.h" #include "net/base/net_export.h" diff --git a/net/cert/x509_certificate.cc b/net/cert/x509_certificate.cc index cc3b4cd..382be8e 100644 --- a/net/cert/x509_certificate.cc +++ b/net/cert/x509_certificate.cc @@ -18,8 +18,8 @@ #include "base/metrics/histogram.h" #include "base/pickle.h" #include "base/sha1.h" -#include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_piece.h" #include "base/synchronization/lock.h" #include "base/time.h" #include "googleurl/src/url_canon_ip.h" diff --git a/net/cert/x509_certificate.h b/net/cert/x509_certificate.h index 16f4d8d..fee25b6 100644 --- a/net/cert/x509_certificate.h +++ b/net/cert/x509_certificate.h @@ -12,7 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/time.h" #include "net/base/net_export.h" #include "net/cert/cert_type.h" diff --git a/net/cert/x509_certificate_mac.cc b/net/cert/x509_certificate_mac.cc index 4f4d9ff..e00e147 100644 --- a/net/cert/x509_certificate_mac.cc +++ b/net/cert/x509_certificate_mac.cc @@ -18,7 +18,7 @@ #include "base/memory/singleton.h" #include "base/pickle.h" #include "base/sha1.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/strings/sys_string_conversions.h" #include "base/synchronization/lock.h" #include "crypto/cssm_init.h" diff --git a/net/cert/x509_util_openssl.cc b/net/cert/x509_util_openssl.cc index 5853b64..e98c2a0 100644 --- a/net/cert/x509_util_openssl.cc +++ b/net/cert/x509_util_openssl.cc @@ -8,7 +8,7 @@ #include <algorithm> #include "base/logging.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/cert/x509_cert_types.h" namespace net { diff --git a/net/dns/dns_query.h b/net/dns/dns_query.h index 59db9a1..dc5f8e8 100644 --- a/net/dns/dns_query.h +++ b/net/dns/dns_query.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" namespace net { diff --git a/net/dns/dns_response.h b/net/dns/dns_response.h index 4201b2d..78fb7357 100644 --- a/net/dns/dns_response.h +++ b/net/dns/dns_response.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/time.h" #include "net/base/net_export.h" #include "net/base/net_util.h" diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc index e670b8b..6d4bf01 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc @@ -17,7 +17,7 @@ #include "base/metrics/histogram.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/threading/non_thread_safe.h" #include "base/timer.h" #include "base/values.h" diff --git a/net/ftp/ftp_ctrl_response_buffer.cc b/net/ftp/ftp_ctrl_response_buffer.cc index 9fb9fd8..218ab43 100644 --- a/net/ftp/ftp_ctrl_response_buffer.cc +++ b/net/ftp/ftp_ctrl_response_buffer.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/values.h" #include "net/base/net_errors.h" diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc index 68307a2..b2c816c 100644 --- a/net/ftp/ftp_util.cc +++ b/net/ftp/ftp_util.cc @@ -12,8 +12,8 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" #include "base/time.h" diff --git a/net/http/http_chunked_decoder.cc b/net/http/http_chunked_decoder.cc index b2674f6..770f232 100644 --- a/net/http/http_chunked_decoder.cc +++ b/net/http/http_chunked_decoder.cc @@ -46,8 +46,8 @@ #include "base/logging.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_piece.h" #include "net/base/net_errors.h" namespace net { diff --git a/net/http/http_request_headers.h b/net/http/http_request_headers.h index 62f931c..6178117 100644 --- a/net/http/http_request_headers.h +++ b/net/http/http_request_headers.h @@ -14,7 +14,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/base/net_log.h" diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc index 824cfd0..cec3de5 100644 --- a/net/http/http_response_headers.cc +++ b/net/http/http_response_headers.cc @@ -14,10 +14,10 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/pickle.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" +#include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/time.h" #include "base/values.h" #include "net/base/escape.h" diff --git a/net/http/http_security_headers_unittest.cc b/net/http/http_security_headers_unittest.cc index 9f2f37b..f9a1c1f 100644 --- a/net/http/http_security_headers_unittest.cc +++ b/net/http/http_security_headers_unittest.cc @@ -4,7 +4,7 @@ #include "base/base64.h" #include "base/sha1.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "crypto/sha2.h" #include "net/base/net_log.h" #include "net/base/test_completion_callback.h" diff --git a/net/http/http_stream_parser.h b/net/http/http_stream_parser.h index 493165e..a41e393 100644 --- a/net/http/http_stream_parser.h +++ b/net/http/http_stream_parser.h @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/completion_callback.h" #include "net/base/net_export.h" #include "net/base/net_log.h" diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc index 3724ae1..989a3a0 100644 --- a/net/http/http_stream_parser_unittest.cc +++ b/net/http/http_stream_parser_unittest.cc @@ -8,8 +8,8 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" -#include "base/string_piece.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/net/http/http_util.cc b/net/http/http_util.cc index 38b288d..4a3b754 100644 --- a/net/http/http_util.cc +++ b/net/http/http_util.cc @@ -12,9 +12,9 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/strings/string_tokenizer.h" #include "base/time.h" diff --git a/net/http/transport_security_state_unittest.cc b/net/http/transport_security_state_unittest.cc index 0aa309b..65a187b 100644 --- a/net/http/transport_security_state_unittest.cc +++ b/net/http/transport_security_state_unittest.cc @@ -11,7 +11,7 @@ #include "base/base64.h" #include "base/files/file_path.h" #include "base/sha1.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "crypto/sha2.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc index 5f63c5c..517c023 100644 --- a/net/proxy/proxy_bypass_rules.cc +++ b/net/proxy/proxy_bypass_rules.cc @@ -6,9 +6,9 @@ #include "base/stl_util.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/strings/string_tokenizer.h" #include "net/base/net_util.h" diff --git a/net/quic/crypto/crypto_framer.h b/net/quic/crypto/crypto_framer.h index 4e3623b8..07ffa39 100644 --- a/net/quic/crypto/crypto_framer.h +++ b/net/quic/crypto/crypto_framer.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/quic/crypto/crypto_handshake.h" #include "net/quic/crypto/crypto_protocol.h" diff --git a/net/quic/crypto/crypto_handshake.h b/net/quic/crypto/crypto_handshake.h index f8bfd0d..fa6efd3 100644 --- a/net/quic/crypto/crypto_handshake.h +++ b/net/quic/crypto/crypto_handshake.h @@ -10,7 +10,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/ip_endpoint.h" #include "net/base/net_export.h" #include "net/quic/crypto/crypto_protocol.h" diff --git a/net/quic/crypto/crypto_utils.h b/net/quic/crypto/crypto_utils.h index 058a1ab..442830b 100644 --- a/net/quic/crypto/crypto_utils.h +++ b/net/quic/crypto/crypto_utils.h @@ -9,7 +9,7 @@ #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/quic/crypto/crypto_handshake.h" #include "net/quic/crypto/crypto_protocol.h" diff --git a/net/quic/crypto/curve25519_key_exchange.h b/net/quic/crypto/curve25519_key_exchange.h index 77e78e8..73cf741 100644 --- a/net/quic/crypto/curve25519_key_exchange.h +++ b/net/quic/crypto/curve25519_key_exchange.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/quic/crypto/key_exchange.h" diff --git a/net/quic/crypto/curve25519_key_exchange_test.cc b/net/quic/crypto/curve25519_key_exchange_test.cc index b1443aa0..83ddcfb 100644 --- a/net/quic/crypto/curve25519_key_exchange_test.cc +++ b/net/quic/crypto/curve25519_key_exchange_test.cc @@ -5,7 +5,7 @@ #include "net/quic/crypto/curve25519_key_exchange.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/quic/crypto/quic_random.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/quic/crypto/key_exchange.h b/net/quic/crypto/key_exchange.h index c1028ca..4f043bd 100644 --- a/net/quic/crypto/key_exchange.h +++ b/net/quic/crypto/key_exchange.h @@ -7,7 +7,7 @@ #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/quic/crypto/crypto_protocol.h" diff --git a/net/quic/crypto/p256_key_exchange.h b/net/quic/crypto/p256_key_exchange.h index 59439b6..f30d292 100644 --- a/net/quic/crypto/p256_key_exchange.h +++ b/net/quic/crypto/p256_key_exchange.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/quic/crypto/key_exchange.h" diff --git a/net/quic/quic_crypto_stream.cc b/net/quic/quic_crypto_stream.cc index 79c912a..f033af8 100644 --- a/net/quic/quic_crypto_stream.cc +++ b/net/quic/quic_crypto_stream.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/quic/crypto/crypto_handshake.h" #include "net/quic/quic_connection.h" #include "net/quic/quic_session.h" diff --git a/net/quic/quic_data_reader.h b/net/quic/quic_data_reader.h index 5477bd1..fff07dd 100644 --- a/net/quic/quic_data_reader.h +++ b/net/quic/quic_data_reader.h @@ -6,7 +6,7 @@ #define NET_QUIC_QUIC_DATA_READER_H_ #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/int128.h" #include "net/base/net_export.h" diff --git a/net/quic/quic_data_writer.h b/net/quic/quic_data_writer.h index f80e905..5aa055a 100644 --- a/net/quic/quic_data_writer.h +++ b/net/quic/quic_data_writer.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/port.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/int128.h" #include "net/base/net_export.h" #include "net/quic/quic_protocol.h" diff --git a/net/quic/quic_fec_group.h b/net/quic/quic_fec_group.h index e421074..0dd66ec 100644 --- a/net/quic/quic_fec_group.h +++ b/net/quic/quic_fec_group.h @@ -11,7 +11,7 @@ #include <set> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/quic/quic_protocol.h" namespace net { diff --git a/net/quic/quic_framer.h b/net/quic/quic_framer.h index 80d7854..efb61c5 100644 --- a/net/quic/quic_framer.h +++ b/net/quic/quic_framer.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/quic/quic_protocol.h" diff --git a/net/quic/quic_packet_creator.h b/net/quic/quic_packet_creator.h index 60f9fb4..2e5c596 100644 --- a/net/quic/quic_packet_creator.h +++ b/net/quic/quic_packet_creator.h @@ -13,7 +13,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/quic/quic_fec_group.h" #include "net/quic/quic_framer.h" #include "net/quic/quic_protocol.h" diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h index 44aedf9..48e647f 100644 --- a/net/quic/quic_protocol.h +++ b/net/quic/quic_protocol.h @@ -17,7 +17,7 @@ #include "base/basictypes.h" #include "base/hash_tables.h" #include "base/logging.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/int128.h" #include "net/base/net_export.h" #include "net/quic/quic_bandwidth.h" diff --git a/net/quic/test_tools/crypto_test_utils.cc b/net/quic/test_tools/crypto_test_utils.cc index 7afad69..5086044 100644 --- a/net/quic/test_tools/crypto_test_utils.cc +++ b/net/quic/test_tools/crypto_test_utils.cc @@ -4,7 +4,7 @@ #include "net/quic/test_tools/crypto_test_utils.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/quic/crypto/quic_decrypter.h" #include "net/quic/crypto/quic_encrypter.h" #include "net/quic/quic_crypto_client_stream.h" diff --git a/net/socket/ssl_socket.h b/net/socket/ssl_socket.h index 86c03db..68d1e4a 100644 --- a/net/socket/ssl_socket.h +++ b/net/socket/ssl_socket.h @@ -6,7 +6,7 @@ #define NET_SOCKET_SSL_SOCKET_H_ #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/socket/stream_socket.h" namespace net { diff --git a/net/spdy/spdy_credential_builder.cc b/net/spdy/spdy_credential_builder.cc index c0fb40d..1742aff 100644 --- a/net/spdy/spdy_credential_builder.cc +++ b/net/spdy/spdy_credential_builder.cc @@ -5,7 +5,7 @@ #include "net/spdy/spdy_credential_builder.h" #include "base/logging.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" #include "net/base/net_errors.h" diff --git a/net/spdy/spdy_frame_builder.h b/net/spdy/spdy_frame_builder.h index db67b0a..7f9b3b1 100644 --- a/net/spdy/spdy_frame_builder.h +++ b/net/spdy/spdy_frame_builder.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/sys_byteorder.h" #include "net/base/net_export.h" #include "net/spdy/spdy_protocol.h" diff --git a/net/spdy/spdy_frame_reader.h b/net/spdy/spdy_frame_reader.h index e6a0b6d..886f5be 100644 --- a/net/spdy/spdy_frame_reader.h +++ b/net/spdy/spdy_frame_reader.h @@ -6,7 +6,7 @@ #define NET_SPDY_SPDY_FRAME_READER_H_ #include "base/basictypes.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" namespace net { diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h index 258ab40..b47a268 100644 --- a/net/spdy/spdy_protocol.h +++ b/net/spdy/spdy_protocol.h @@ -19,7 +19,7 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "base/sys_byteorder.h" #include "net/base/net_export.h" #include "net/spdy/spdy_bitmasks.h" diff --git a/net/spdy/spdy_stream_spdy2_unittest.cc b/net/spdy/spdy_stream_spdy2_unittest.cc index 564215e..64cb31a 100644 --- a/net/spdy/spdy_stream_spdy2_unittest.cc +++ b/net/spdy/spdy_stream_spdy2_unittest.cc @@ -7,15 +7,15 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/completion_callback.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" #include "net/spdy/buffered_spdy_framer.h" -#include "net/spdy/spdy_stream.h" #include "net/spdy/spdy_http_utils.h" #include "net/spdy/spdy_protocol.h" #include "net/spdy/spdy_session.h" +#include "net/spdy/spdy_stream.h" #include "net/spdy/spdy_stream_test_util.h" #include "net/spdy/spdy_test_util_common.h" #include "net/spdy/spdy_test_util_spdy2.h" diff --git a/net/spdy/spdy_stream_spdy3_unittest.cc b/net/spdy/spdy_stream_spdy3_unittest.cc index a465c07..78c6855 100644 --- a/net/spdy/spdy_stream_spdy3_unittest.cc +++ b/net/spdy/spdy_stream_spdy3_unittest.cc @@ -5,15 +5,15 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/completion_callback.h" #include "net/base/net_log_unittest.h" #include "net/base/request_priority.h" #include "net/spdy/buffered_spdy_framer.h" -#include "net/spdy/spdy_stream.h" #include "net/spdy/spdy_http_utils.h" #include "net/spdy/spdy_protocol.h" #include "net/spdy/spdy_session.h" +#include "net/spdy/spdy_stream.h" #include "net/spdy/spdy_stream_test_util.h" #include "net/spdy/spdy_test_util_common.h" #include "net/spdy/spdy_test_util_spdy3.h" diff --git a/net/spdy/spdy_stream_test_util.h b/net/spdy/spdy_stream_test_util.h index bc82365..7c1c51a 100644 --- a/net/spdy/spdy_stream_test_util.h +++ b/net/spdy/spdy_stream_test_util.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" #include "net/spdy/spdy_stream.h" diff --git a/net/spdy/spdy_test_util_spdy2.h b/net/spdy/spdy_test_util_spdy2.h index 1f51a2f..d77fda3 100644 --- a/net/spdy/spdy_test_util_spdy2.h +++ b/net/spdy/spdy_test_util_spdy2.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/host_port_pair.h" #include "net/base/request_priority.h" #include "net/cert/cert_verifier.h" diff --git a/net/spdy/spdy_test_util_spdy3.h b/net/spdy/spdy_test_util_spdy3.h index 9c464f5c..3589d0d 100644 --- a/net/spdy/spdy_test_util_spdy3.h +++ b/net/spdy/spdy_test_util_spdy3.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "crypto/ec_private_key.h" #include "crypto/ec_signature_creator.h" #include "net/base/host_port_pair.h" diff --git a/net/ssl/ssl_config_service.h b/net/ssl/ssl_config_service.h index 01c20cd..a111594 100644 --- a/net/ssl/ssl_config_service.h +++ b/net/ssl/ssl_config_service.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/cert/cert_status_flags.h" #include "net/cert/crl_set.h" diff --git a/net/tools/dump_cache/url_to_filename_encoder_unittest.cc b/net/tools/dump_cache/url_to_filename_encoder_unittest.cc index 23bbc6d..4ef0466 100644 --- a/net/tools/dump_cache/url_to_filename_encoder_unittest.cc +++ b/net/tools/dump_cache/url_to_filename_encoder_unittest.cc @@ -7,9 +7,9 @@ #include <string> #include <vector> -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "testing/gtest/include/gtest/gtest.h" using base::StringPiece; diff --git a/net/tools/flip_server/balsa_frame.cc b/net/tools/flip_server/balsa_frame.cc index d33b03e..dead665 100644 --- a/net/tools/flip_server/balsa_frame.cc +++ b/net/tools/flip_server/balsa_frame.cc @@ -17,7 +17,7 @@ #include "base/logging.h" #include "base/port.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/tools/flip_server/balsa_enums.h" #include "net/tools/flip_server/balsa_headers.h" #include "net/tools/flip_server/balsa_visitor_interface.h" diff --git a/net/tools/flip_server/balsa_headers.cc b/net/tools/flip_server/balsa_headers.cc index 0cba73b..8547e6b 100644 --- a/net/tools/flip_server/balsa_headers.cc +++ b/net/tools/flip_server/balsa_headers.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/port.h" #include "base/stringprintf.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/tools/flip_server/balsa_enums.h" #include "net/tools/flip_server/buffer_interface.h" #include "net/tools/flip_server/simple_buffer.h" diff --git a/net/tools/flip_server/balsa_headers.h b/net/tools/flip_server/balsa_headers.h index 1bd3100..6fabdd4 100644 --- a/net/tools/flip_server/balsa_headers.h +++ b/net/tools/flip_server/balsa_headers.h @@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/port.h" #include "base/logging.h" -#include "base/string_piece.h" +#include "base/port.h" +#include "base/strings/string_piece.h" #include "net/tools/flip_server/balsa_enums.h" #include "net/tools/flip_server/string_piece_utils.h" diff --git a/net/tools/flip_server/balsa_headers_token_utils.h b/net/tools/flip_server/balsa_headers_token_utils.h index c2c5a68..f50c606 100644 --- a/net/tools/flip_server/balsa_headers_token_utils.h +++ b/net/tools/flip_server/balsa_headers_token_utils.h @@ -8,8 +8,8 @@ #ifndef NET_TOOLS_FLIP_SERVER_BALSA_HEADERS_TOKEN_UTILS_H_ #define NET_TOOLS_FLIP_SERVER_BALSA_HEADERS_TOKEN_UTILS_H_ +#include "base/strings/string_piece.h" #include "net/tools/flip_server/balsa_headers.h" -#include "base/string_piece.h" namespace net { diff --git a/net/tools/flip_server/mem_cache.cc b/net/tools/flip_server/mem_cache.cc index 2e9ce55..0af21e0 100644 --- a/net/tools/flip_server/mem_cache.cc +++ b/net/tools/flip_server/mem_cache.cc @@ -14,7 +14,7 @@ #include <deque> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/tools/dump_cache/url_to_filename_encoder.h" #include "net/tools/dump_cache/url_utilities.h" #include "net/tools/flip_server/balsa_frame.h" diff --git a/net/tools/flip_server/split.cc b/net/tools/flip_server/split.cc index 2d8659a..7900513 100644 --- a/net/tools/flip_server/split.cc +++ b/net/tools/flip_server/split.cc @@ -8,7 +8,7 @@ #include <vector> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" namespace net { diff --git a/net/tools/flip_server/split.h b/net/tools/flip_server/split.h index 247fef8..aae20b0 100644 --- a/net/tools/flip_server/split.h +++ b/net/tools/flip_server/split.h @@ -6,7 +6,7 @@ #define NET_TOOLS_FLIP_SERVER_SPLIT_H_ #include <vector> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" namespace net { diff --git a/net/tools/flip_server/string_piece_utils.h b/net/tools/flip_server/string_piece_utils.h index 408ebfb..0bc7794 100644 --- a/net/tools/flip_server/string_piece_utils.h +++ b/net/tools/flip_server/string_piece_utils.h @@ -8,7 +8,7 @@ #include <ctype.h> #include "base/port.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" namespace net { diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc index dd7ea1d6..52a22dc 100644 --- a/net/tools/quic/quic_dispatcher_test.cc +++ b/net/tools/quic/quic_dispatcher_test.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/quic/crypto/crypto_handshake.h" #include "net/quic/quic_crypto_stream.h" #include "net/quic/test_tools/quic_test_utils.h" diff --git a/net/tools/quic/quic_in_memory_cache.h b/net/tools/quic/quic_in_memory_cache.h index 1eef30d..c0e3560 100644 --- a/net/tools/quic/quic_in_memory_cache.h +++ b/net/tools/quic/quic_in_memory_cache.h @@ -9,7 +9,7 @@ #include "base/hash_tables.h" #include "base/memory/singleton.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/tools/flip_server/balsa_frame.h" #include "net/tools/flip_server/balsa_headers.h" diff --git a/net/tools/quic/quic_reliable_client_stream.h b/net/tools/quic/quic_reliable_client_stream.h index 17cc7d4..c46420b 100644 --- a/net/tools/quic/quic_reliable_client_stream.h +++ b/net/tools/quic/quic_reliable_client_stream.h @@ -8,7 +8,7 @@ #include <sys/types.h> #include <string> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/quic/quic_protocol.h" #include "net/quic/reliable_quic_stream.h" #include "net/tools/flip_server/balsa_frame.h" diff --git a/net/tools/quic/quic_spdy_client_stream.h b/net/tools/quic/quic_spdy_client_stream.h index 1a4d81c..ec4d257 100644 --- a/net/tools/quic/quic_spdy_client_stream.h +++ b/net/tools/quic/quic_spdy_client_stream.h @@ -5,7 +5,7 @@ #ifndef NET_TOOLS_QUIC_QUIC_SPDY_CLIENT_STREAM_H_ #define NET_TOOLS_QUIC_QUIC_SPDY_CLIENT_STREAM_H_ -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/io_buffer.h" #include "net/tools/quic/quic_reliable_client_stream.h" diff --git a/net/tools/quic/quic_time_wait_list_manager.h b/net/tools/quic/quic_time_wait_list_manager.h index 9919134..041f6ea 100644 --- a/net/tools/quic/quic_time_wait_list_manager.h +++ b/net/tools/quic/quic_time_wait_list_manager.h @@ -11,7 +11,7 @@ #include <deque> #include "base/hash_tables.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/quic/quic_blocked_writer_interface.h" #include "net/quic/quic_framer.h" #include "net/quic/quic_protocol.h" diff --git a/net/tools/quic/spdy_utils.cc b/net/tools/quic/spdy_utils.cc index f15b5d4..0c3273b 100644 --- a/net/tools/quic/spdy_utils.cc +++ b/net/tools/quic/spdy_utils.cc @@ -7,9 +7,9 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_piece.h" #include "googleurl/src/gurl.h" #include "net/spdy/spdy_frame_builder.h" #include "net/spdy/spdy_framer.h" diff --git a/net/tools/quic/test_tools/http_message_test_utils.h b/net/tools/quic/test_tools/http_message_test_utils.h index c01df42..d389e21 100644 --- a/net/tools/quic/test_tools/http_message_test_utils.h +++ b/net/tools/quic/test_tools/http_message_test_utils.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/tools/flip_server/balsa_enums.h" #include "net/tools/flip_server/balsa_headers.h" diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 285add7d..0d7c066 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -22,9 +22,9 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "net/base/capturing_net_log.h" diff --git a/net/websockets/websocket_handshake_handler.cc b/net/websockets/websocket_handshake_handler.cc index 8cb44cc..1b41062 100644 --- a/net/websockets/websocket_handshake_handler.cc +++ b/net/websockets/websocket_handshake_handler.cc @@ -8,9 +8,9 @@ #include "base/md5.h" #include "base/sha1.h" #include "base/string_number_conversions.h" -#include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_piece.h" #include "base/strings/string_tokenizer.h" #include "googleurl/src/gurl.h" #include "net/http/http_response_headers.h" |