diff options
Diffstat (limited to 'net/http')
35 files changed, 76 insertions, 76 deletions
diff --git a/net/http/disk_cache_based_ssl_host_info.h b/net/http/disk_cache_based_ssl_host_info.h index 905a3a9..1df838c 100644 --- a/net/http/disk_cache_based_ssl_host_info.h +++ b/net/http/disk_cache_based_ssl_host_info.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,9 +7,9 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" -#include "base/weak_ptr.h" #include "net/base/completion_callback.h" #include "net/disk_cache/disk_cache.h" #include "net/socket/ssl_host_info.h" diff --git a/net/http/http_auth.h b/net/http/http_auth.h index cc147a2..99c3c81 100644 --- a/net/http/http_auth.h +++ b/net/http/http_auth.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "net/http/http_util.h" diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h index 965cff7..e8f7f16 100644 --- a/net/http/http_auth_cache.h +++ b/net/http/http_auth_cache.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include <string> #include "base/gtest_prod_util.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "googleurl/src/gurl.h" #include "net/http/http_auth.h" diff --git a/net/http/http_auth_controller.h b/net/http/http_auth_controller.h index d7faaac..93eae5b 100644 --- a/net/http/http_auth_controller.h +++ b/net/http/http_auth_controller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,8 +10,8 @@ #include <string> #include "base/basictypes.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "base/threading/non_thread_safe.h" #include "googleurl/src/gurl.h" diff --git a/net/http/http_auth_filter_unittest.cc b/net/http/http_auth_filter_unittest.cc index c7f91f9..73f649e 100644 --- a/net/http/http_auth_filter_unittest.cc +++ b/net/http/http_auth_filter_unittest.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include <iostream> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "net/http/http_auth_filter.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/http/http_auth_gssapi_posix_unittest.cc b/net/http/http_auth_gssapi_posix_unittest.cc index 43a3285..01a62b3 100644 --- a/net/http/http_auth_gssapi_posix_unittest.cc +++ b/net/http/http_auth_gssapi_posix_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/native_library.h" -#include "base/scoped_ptr.h" #include "net/base/net_errors.h" #include "net/http/mock_gssapi_library_posix.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/http/http_auth_handler_basic_unittest.cc b/net/http/http_auth_handler_basic_unittest.cc index 51352da..b75e2c9 100644 --- a/net/http/http_auth_handler_basic_unittest.cc +++ b/net/http/http_auth_handler_basic_unittest.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" diff --git a/net/http/http_auth_handler_digest.h b/net/http/http_auth_handler_digest.h index fca77e4..f279b65 100644 --- a/net/http/http_auth_handler_digest.h +++ b/net/http/http_auth_handler_digest.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "net/http/http_auth_handler.h" #include "net/http/http_auth_handler_factory.h" diff --git a/net/http/http_auth_handler_factory.h b/net/http/http_auth_handler_factory.h index 1e4134f..c5cf98e 100644 --- a/net/http/http_auth_handler_factory.h +++ b/net/http/http_auth_handler_factory.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/http/http_auth.h" #include "net/http/url_security_manager.h" diff --git a/net/http/http_auth_handler_factory_unittest.cc b/net/http/http_auth_handler_factory_unittest.cc index 3145c4b..81c4af6 100644 --- a/net/http/http_auth_handler_factory_unittest.cc +++ b/net/http/http_auth_handler_factory_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/http/http_auth_handler.h" diff --git a/net/http/http_auth_unittest.cc b/net/http/http_auth_unittest.cc index 6788be2..fe11c03 100644 --- a/net/http/http_auth_unittest.cc +++ b/net/http/http_auth_unittest.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include <set> #include <string> -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" diff --git a/net/http/http_basic_stream.h b/net/http/http_basic_stream.h index a706e8e..2c26315 100644 --- a/net/http/http_basic_stream.h +++ b/net/http/http_basic_stream.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -13,7 +13,7 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/http/http_stream.h" namespace net { diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index 830fbaa..3943619 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,9 +14,9 @@ #include "base/callback.h" #include "base/format_macros.h" +#include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/pickle.h" -#include "base/ref_counted.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/net/http/http_cache.h b/net/http/http_cache.h index b33689d..f1c5fbe 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,11 +22,11 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/hash_tables.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" -#include "base/scoped_ptr.h" #include "base/task.h" #include "base/threading/non_thread_safe.h" -#include "base/weak_ptr.h" #include "net/base/cache_type.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index 6665d5ff..bf29f85 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,9 +13,9 @@ #include <string> #include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/ref_counted.h" #include "base/string_util.h" #include "base/time.h" #include "net/base/cert_status_flags.h" diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc index 52e48e6..5c645bb 100644 --- a/net/http/http_cache_unittest.cc +++ b/net/http/http_cache_unittest.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "net/http/http_cache.h" #include "base/hash_tables.h" +#include "base/memory/scoped_vector.h" #include "base/message_loop.h" -#include "base/scoped_vector.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "net/base/cache_type.h" diff --git a/net/http/http_net_log_params.h b/net/http/http_net_log_params.h index c32250e..92039ca 100644 --- a/net/http/http_net_log_params.h +++ b/net/http/http_net_log_params.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/net_log.h" #include "net/http/http_request_headers.h" diff --git a/net/http/http_network_layer.h b/net/http/http_network_layer.h index db3d809..f4843fe 100644 --- a/net/http/http_network_layer.h +++ b/net/http/http_network_layer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include <string> -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "net/http/http_transaction_factory.h" diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index 9a4b85c..f25227b4 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include <set> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" diff --git a/net/http/http_network_session_peer.h b/net/http/http_network_session_peer.h index 06101ca..e380302 100644 --- a/net/http/http_network_session_peer.h +++ b/net/http/http_network_session_peer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define NET_HTTP_HTTP_NETWORK_SESSION_PEER_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" namespace net { diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 4bd867d..fb197f8 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,10 +9,10 @@ #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/memory/scoped_ptr.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" -#include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/string_util.h" diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h index 3cec010..2f55f4f 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" #include "net/base/net_log.h" #include "net/base/request_priority.h" diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 6e7e5fd..f79b2d2 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "net/base/auth.h" #include "net/base/capturing_net_log.h" diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h index 2cf3c6a..f44a7eb 100644 --- a/net/http/http_proxy_client_socket.h +++ b/net/http/http_proxy_client_socket.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" #include "net/base/net_log.h" diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h index 4ae07cf..cc9c7a8 100644 --- a/net/http/http_proxy_client_socket_pool.h +++ b/net/http/http_proxy_client_socket_pool.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,8 @@ #include <string> #include "base/basictypes.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" #include "net/base/host_port_pair.h" #include "net/http/http_auth.h" diff --git a/net/http/http_request_info.h b/net/http/http_request_info.h index 7c73aa6..70c1300 100644 --- a/net/http/http_request_info.h +++ b/net/http/http_request_info.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,7 @@ #pragma once #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "googleurl/src/gurl.h" #include "net/base/request_priority.h" #include "net/base/upload_data.h" diff --git a/net/http/http_response_body_drainer.h b/net/http/http_response_body_drainer.h index 1aa4e93..7ee1d7c 100644 --- a/net/http/http_response_body_drainer.h +++ b/net/http/http_response_body_drainer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,8 +7,8 @@ #pragma once #include "base/basictypes.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "net/base/completion_callback.h" #include "net/http/http_network_session.h" diff --git a/net/http/http_response_headers.h b/net/http/http_response_headers.h index 3c2eae0..7187da5 100644 --- a/net/http/http_response_headers.h +++ b/net/http/http_response_headers.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/hash_tables.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/http/http_version.h" class Pickle; diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h index eeecf16..4375f3f 100644 --- a/net/http/http_stream_factory.h +++ b/net/http/http_stream_factory.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,8 +8,8 @@ #include <list> #include <string> +#include "base/memory/ref_counted.h" #include "base/string16.h" -#include "base/ref_counted.h" #include "net/base/completion_callback.h" #include "net/base/load_states.h" diff --git a/net/http/http_stream_factory_impl.h b/net/http/http_stream_factory_impl.h index b43bf13..93e8c57 100644 --- a/net/http/http_stream_factory_impl.h +++ b/net/http/http_stream_factory_impl.h @@ -8,7 +8,7 @@ #include <map> #include <set> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/host_port_pair.h" #include "net/http/http_stream_factory.h" #include "net/base/net_log.h" diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h index 213b590..f66064f 100644 --- a/net/http/http_stream_factory_impl_job.h +++ b/net/http/http_stream_factory_impl_job.h @@ -5,8 +5,8 @@ #ifndef NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "net/base/completion_callback.h" #include "net/base/net_log.h" diff --git a/net/http/http_stream_factory_impl_request.h b/net/http/http_stream_factory_impl_request.h index 248a316..4a7ace4 100644 --- a/net/http/http_stream_factory_impl_request.h +++ b/net/http/http_stream_factory_impl_request.h @@ -6,7 +6,7 @@ #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_REQUEST_H_ #include <set> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "net/base/net_log.h" #include "net/http/http_stream_factory_impl.h" diff --git a/net/http/http_transaction_factory.h b/net/http/http_transaction_factory.h index 0d0f642..e457828 100644 --- a/net/http/http_transaction_factory.h +++ b/net/http/http_transaction_factory.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,7 +6,7 @@ #define NET_HTTP_HTTP_TRANSACTION_FACTORY_H__ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace net { diff --git a/net/http/http_util.h b/net/http/http_util.h index 3da1635..7f68e9d 100644 --- a/net/http/http_util.h +++ b/net/http/http_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string_tokenizer.h" #include "googleurl/src/gurl.h" #include "net/http/http_byte_range.h" diff --git a/net/http/url_security_manager.h b/net/http/url_security_manager.h index 119d6bd..2692252 100644 --- a/net/http/url_security_manager.h +++ b/net/http/url_security_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,8 +6,8 @@ #define NET_HTTP_URL_SECURITY_MANAGER_H_ #pragma once -#include "base/scoped_ptr.h" #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" class GURL; |