Skip to content

Commit

Permalink
Use a direct include of strings headers in net/ocsp/, net/proxy/, net…
Browse files Browse the repository at this point in the history 
…/quic/, net/server/, net/socket/, net/spdy/, net/ssl/.

BUG=247723
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16017010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205487 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
avi@chromium.org committed Jun 11, 2013
1 parent 8383d2b commit fc9be58
Show file tree
Hide file tree
Showing 66 changed files with 86 additions and 86 deletions.
4 changes: 2 additions & 2 deletions net/ocsp/nss_ocsp.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/threading/non_thread_safe.h"
#include "base/timer.h"
#include "net/base/completion_callback.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/dhcp_proxy_script_fetcher.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "googleurl/src/gurl.h"
#include "net/base/completion_callback.h"
#include "net/base/net_export.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/mock_proxy_script_fetcher.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "base/logging.h"
#include "base/message_loop.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "net/base/net_errors.h"

Expand Down
4 changes: 2 additions & 2 deletions net/proxy/multi_threaded_proxy_resolver.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "base/bind_helpers.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
#include "net/base/net_errors.h"
Expand Down
4 changes: 2 additions & 2 deletions net/proxy/multi_threaded_proxy_resolver_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include "base/message_loop.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h"
Expand Down
6 changes: 3 additions & 3 deletions net/proxy/proxy_bypass_rules.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include "net/proxy/proxy_bypass_rules.h"

#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_tokenizer.h"
#include "net/base/net_util.h"
Expand Down
4 changes: 2 additions & 2 deletions net/proxy/proxy_bypass_rules_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "net/proxy/proxy_bypass_rules.h"

#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "net/proxy/proxy_config_service_common_unittest.h"
#include "testing/gtest/include/gtest/gtest.h"

Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_config.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "net/proxy/proxy_config.h"

#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/string_tokenizer.h"
#include "base/values.h"
#include "net/proxy/proxy_info.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_config_service_android.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "base/memory/ref_counted.h"
#include "base/observer_list.h"
#include "base/sequenced_task_runner.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/string_tokenizer.h"
#include "googleurl/src/url_parse.h"
#include "jni/ProxyChangeListener_jni.h"
Expand Down
4 changes: 2 additions & 2 deletions net/proxy/proxy_config_service_linux.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include "base/message_loop.h"
#include "base/nix/xdg_util.h"
#include "base/single_thread_task_runner.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/string_tokenizer.h"
#include "base/threading/thread_restrictions.h"
#include "base/timer.h"
Expand Down
4 changes: 2 additions & 2 deletions net/proxy/proxy_config_service_linux_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "base/files/file_path.h"
#include "base/format_macros.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "net/proxy/proxy_config.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_config_service_win.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/string_tokenizer.h"
#include "base/threading/thread_restrictions.h"
#include "base/win/registry.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_resolver.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "googleurl/src/gurl.h"
#include "net/base/completion_callback.h"
#include "net/base/load_states.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_resolver_error_observer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define NET_PROXY_PROXY_RESOLVER_ERROR_OBSERVER_H_

#include "base/basictypes.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "net/base/net_export.h"

namespace net {
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_resolver_mac.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "base/logging.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "net/base/net_errors.h"
#include "net/proxy/proxy_info.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_resolver_perftest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/perftimer.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "net/base/net_errors.h"
#include "net/dns/mock_host_resolver.h"
#include "net/proxy/proxy_info.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_resolver_script_data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define NET_PROXY_PROXY_RESOLVER_SCRIPT_DATA_H_

#include "base/memory/ref_counted.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_export.h"

Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_resolver_v8.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_resolver_v8_tracing.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/metrics/histogram.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/synchronization/cancellation_flag.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
Expand Down
4 changes: 2 additions & 2 deletions net/proxy/proxy_resolver_v8_tracing_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h"
Expand Down
4 changes: 2 additions & 2 deletions net/proxy/proxy_resolver_v8_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_resolver_winhttp.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <winhttp.h>

#include "base/metrics/histogram.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_script_decider.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "base/format_macros.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "net/base/net_errors.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_script_decider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <vector>

#include "base/memory/ref_counted.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/time.h"
#include "base/timer.h"
#include "googleurl/src/gurl.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_script_decider_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "base/bind.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "net/base/net_errors.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_script_fetcher.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef NET_PROXY_PROXY_SCRIPT_FETCHER_H_
#define NET_PROXY_PROXY_SCRIPT_FETCHER_H_

#include "base/string16.h"
#include "base/strings/string16.h"
#include "net/base/completion_callback.h"
#include "net/base/net_export.h"

Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_script_fetcher_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "base/i18n/icu_string_conversions.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "net/base/data_url.h"
#include "net/base/io_buffer.h"
#include "net/base/load_flags.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_script_fetcher_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/time.h"
#include "net/proxy/proxy_script_fetcher.h"
#include "net/url_request/url_request.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_server.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <algorithm>

#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "net/base/net_util.h"
#include "net/http/http_util.h"

Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_service.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/thread_task_runner_handle.h"
#include "base/values.h"
#include "googleurl/src/gurl.h"
Expand Down
2 changes: 1 addition & 1 deletion net/proxy/proxy_service_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "base/format_macros.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
Expand Down
2 changes: 1 addition & 1 deletion net/quic/crypto/crypto_handshake.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "crypto/secure_hash.h"
Expand Down
2 changes: 1 addition & 1 deletion net/quic/quic_client_session.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
Expand Down
2 changes: 1 addition & 1 deletion net/quic/quic_connection_logger.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "base/bind.h"
#include "base/callback.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "net/base/net_log.h"

Expand Down
2 changes: 1 addition & 1 deletion net/quic/quic_http_stream.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "net/quic/quic_http_stream.h"

#include "base/callback_helpers.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/http/http_response_headers.h"
Expand Down
2 changes: 1 addition & 1 deletion net/quic/quic_stream_factory_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "net/quic/quic_stream_factory.h"

#include "base/run_loop.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "net/dns/mock_host_resolver.h"
#include "net/http/http_response_headers.h"
#include "net/http/http_response_info.h"
Expand Down
2 changes: 1 addition & 1 deletion net/quic/quic_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "base/logging.h"
#include "base/port.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/strings/string_number_conversions.h"

using base::StringPiece;
Expand Down
4 changes: 2 additions & 2 deletions net/server/http_connection.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "net/server/http_connection.h"

#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "net/server/http_server.h"
#include "net/server/web_socket.h"
#include "net/socket/stream_listen_socket.h"
Expand Down
4 changes: 2 additions & 2 deletions net/server/http_server.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/sys_byteorder.h"
#include "build/build_config.h"
#include "net/server/http_connection.h"
Expand Down
4 changes: 2 additions & 2 deletions net/server/web_socket.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "base/logging.h"
#include "base/md5.h"
#include "base/sha1.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/sys_byteorder.h"
#include "net/server/http_connection.h"
#include "net/server/http_server_request_info.h"
Expand Down
Loading

0 comments on commit fc9be58

Please sign in to comment.