diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 01:54:15 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 01:54:15 +0000 |
| commit | 3b63f8f451afcf414a59c529f627c620e4d449d9 (patch) | |
| tree | 2dcbab1c060b29a260c29bb19b67bf97a8293ca3 /net | |
| parent | 9174a108509c2aafe513da68e6e63fbc7df38c85 (diff) | |
| download | chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.zip chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.tar.gz chromium_src-3b63f8f451afcf414a59c529f627c620e4d449d9.tar.bz2 | |
Move some files from base to base/memory.
raw_scoped_refptr_mismatch_checker.h
ref_counted.cc
ref_counted.h
ref_counted_memory.cc
ref_counted_memory.h
ref_counted_unittest.cc
scoped_callback_factory.h
scoped_comptr_win.h
scoped_handle.h
scoped_native_library.cc
scoped_native_library.h
scoped_native_library_unittest.cc
scoped_nsobject.h
scoped_open_process.h
scoped_ptr.h
scoped_ptr_unittest.cc
scoped_temp_dir.cc
scoped_temp_dir.h
scoped_temp_dir_unittest.cc
scoped_vector.h
singleton.h
singleton_objc.h
singleton_unittest.cc
linked_ptr.h
linked_ptr_unittest.cc
weak_ptr.cc
weak_ptr.h
weak_ptr_unittest.cc
BUG=None
TEST=Compile
Review URL: http://codereview.chromium.org/6714032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
204 files changed, 402 insertions, 402 deletions
diff --git a/net/base/address_list.h b/net/base/address_list.h index 2993528..0efd77f 100644 --- a/net/base/address_list.h +++ b/net/base/address_list.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,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/net_util.h" struct addrinfo; diff --git a/net/base/address_list_unittest.cc b/net/base/address_list_unittest.cc index e387f25..03417e6 100644 --- a/net/base/address_list_unittest.cc +++ b/net/base/address_list_unittest.cc @@ -4,7 +4,7 @@ #include "net/base/address_list.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "net/base/host_resolver_proc.h" #include "net/base/net_util.h" diff --git a/net/base/auth.h b/net/base/auth.h index 908b7690..32919c8 100644 --- a/net/base/auth.h +++ b/net/base/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. @@ -8,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" namespace net { diff --git a/net/base/capturing_net_log.h b/net/base/capturing_net_log.h index a7406af..15887e5 100644 --- a/net/base/capturing_net_log.h +++ b/net/base/capturing_net_log.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/atomicops.h" #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/synchronization/lock.h" #include "base/time.h" #include "net/base/net_log.h" diff --git a/net/base/cert_database.cc b/net/base/cert_database.cc index f049aca..70e7a9b 100644 --- a/net/base/cert_database.cc +++ b/net/base/cert_database.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 "net/base/cert_database.h" +#include "base/memory/singleton.h" #include "base/observer_list_threadsafe.h" -#include "base/singleton.h" #include "net/base/x509_certificate.h" namespace net { diff --git a/net/base/cert_database.h b/net/base/cert_database.h index dbfbcc3..c03bca9 100644 --- a/net/base/cert_database.h +++ b/net/base/cert_database.h @@ -10,8 +10,8 @@ #include <vector> #include "base/basictypes.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" -#include "base/ref_counted.h" #include "net/base/cert_type.h" namespace net { diff --git a/net/base/cert_database_nss.cc b/net/base/cert_database_nss.cc index f1467c3..b8a8e30 100644 --- a/net/base/cert_database_nss.cc +++ b/net/base/cert_database_nss.cc @@ -11,9 +11,9 @@ #include <secmod.h> #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/nss_util.h" #include "base/nss_util_internal.h" -#include "base/scoped_ptr.h" #include "net/base/crypto_module.h" #include "net/base/net_errors.h" #include "net/base/x509_certificate.h" diff --git a/net/base/cert_database_nss_unittest.cc b/net/base/cert_database_nss_unittest.cc index 081aeb6..37d48ff 100644 --- a/net/base/cert_database_nss_unittest.cc +++ b/net/base/cert_database_nss_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,10 +11,10 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/lazy_instance.h" +#include "base/memory/scoped_temp_dir.h" #include "base/nss_util.h" #include "base/nss_util_internal.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/base/cert_database.h" diff --git a/net/base/cert_test_util.h b/net/base/cert_test_util.h index 3452ac5..a256e02 100644 --- a/net/base/cert_test_util.h +++ b/net/base/cert_test_util.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,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" class FilePath; diff --git a/net/base/cert_verifier.h b/net/base/cert_verifier.h index 4483214..49491db 100644 --- a/net/base/cert_verifier.h +++ b/net/base/cert_verifier.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "net/base/cert_verify_result.h" diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc index 2c9d110..09bee76 100644 --- a/net/base/cookie_monster.cc +++ b/net/base/cookie_monster.cc @@ -49,9 +49,9 @@ #include "base/basictypes.h" #include "base/format_macros.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/scoped_ptr.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h index 026af8c..440b38a 100644 --- a/net/base/cookie_monster.h +++ b/net/base/cookie_monster.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. @@ -15,8 +15,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/synchronization/lock.h" #include "base/task.h" #include "base/time.h" diff --git a/net/base/cookie_monster_unittest.cc b/net/base/cookie_monster_unittest.cc index 07dccfd..d56c8a1 100644 --- a/net/base/cookie_monster_unittest.cc +++ b/net/base/cookie_monster_unittest.cc @@ -7,10 +7,10 @@ #include <string> #include "base/basictypes.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/threading/platform_thread.h" diff --git a/net/base/cookie_store.h b/net/base/cookie_store.h index 3976169..7d64ee8 100644 --- a/net/base/cookie_store.h +++ b/net/base/cookie_store.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. @@ -12,7 +12,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/time.h" #include "net/base/cookie_options.h" diff --git a/net/base/crypto_module.h b/net/base/crypto_module.h index d02bb71..5fc8946 100644 --- a/net/base/crypto_module.h +++ b/net/base/crypto_module.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 <vector> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #if defined(USE_NSS) typedef struct PK11SlotInfoStr PK11SlotInfo; diff --git a/net/base/directory_lister.h b/net/base/directory_lister.h index b0e524f..dbcb4f5 100644 --- a/net/base/directory_lister.h +++ b/net/base/directory_lister.h @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/synchronization/cancellation_flag.h" #include "base/task.h" #include "base/threading/platform_thread.h" diff --git a/net/base/dnsrr_resolver.cc b/net/base/dnsrr_resolver.cc index cb1a54f..b07df69 100644 --- a/net/base/dnsrr_resolver.cc +++ b/net/base/dnsrr_resolver.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. @@ -12,9 +12,9 @@ #include <windns.h> #endif +#include "base/memory/scoped_ptr.h" +#include "base/memory/singleton.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" -#include "base/singleton.h" #include "base/stl_util-inl.h" #include "base/string_piece.h" #include "base/synchronization/lock.h" diff --git a/net/base/dnsrr_resolver.h b/net/base/dnsrr_resolver.h index a9ff84b..ab86d87 100644 --- a/net/base/dnsrr_resolver.h +++ b/net/base/dnsrr_resolver.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. @@ -12,7 +12,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "build/build_config.h" diff --git a/net/base/dnssec_chain_verifier.cc b/net/base/dnssec_chain_verifier.cc index c79efa8..a915686 100644 --- a/net/base/dnssec_chain_verifier.cc +++ b/net/base/dnssec_chain_verifier.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 "net/base/dnssec_chain_verifier.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/sha1.h" #include "base/sha2.h" #include "base/string_util.h" diff --git a/net/base/dnssec_keyset.cc b/net/base/dnssec_keyset.cc index 2f46c23..29dfc86 100644 --- a/net/base/dnssec_keyset.cc +++ b/net/base/dnssec_keyset.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,8 +9,8 @@ #include <keyhi.h> #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/nss_util.h" -#include "base/scoped_ptr.h" #include "base/time.h" #include "net/base/dns_util.h" diff --git a/net/base/dnssec_unittest.cc b/net/base/dnssec_unittest.cc index 6d19057..e2c666b 100644 --- a/net/base/dnssec_unittest.cc +++ b/net/base/dnssec_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/dns_util.h" #include "net/base/dnssec_chain_verifier.h" #include "net/base/dnssec_keyset.h" diff --git a/net/base/file_stream.h b/net/base/file_stream.h index 52e9ce9..8c8ea8c 100644 --- a/net/base/file_stream.h +++ b/net/base/file_stream.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. @@ -11,8 +11,8 @@ #define NET_BASE_FILE_STREAM_H_ #pragma once +#include "base/memory/scoped_ptr.h" #include "base/platform_file.h" -#include "base/scoped_ptr.h" #include "net/base/completion_callback.h" class FilePath; diff --git a/net/base/filter.h b/net/base/filter.h index b158d59..561c8db 100644 --- a/net/base/filter.h +++ b/net/base/filter.h @@ -35,8 +35,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" class GURL; diff --git a/net/base/gzip_filter.h b/net/base/gzip_filter.h index 2b4de11..6da6338 100644 --- a/net/base/gzip_filter.h +++ b/net/base/gzip_filter.h @@ -17,7 +17,7 @@ #pragma once #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/filter.h" typedef struct z_stream_s z_stream; diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc index aaf3187..2753701 100644 --- a/net/base/gzip_filter_unittest.cc +++ b/net/base/gzip_filter_unittest.cc @@ -12,8 +12,8 @@ #endif #include "base/file_util.h" +#include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_ptr.h" #include "net/base/gzip_filter.h" #include "net/base/mock_filter_context.h" #include "net/base/io_buffer.h" diff --git a/net/base/host_cache.h b/net/base/host_cache.h index 11ab1f3..d39db61 100644 --- a/net/base/host_cache.h +++ b/net/base/host_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/threading/non_thread_safe.h" #include "base/time.h" #include "net/base/address_family.h" diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h index da3816e..f16c265 100644 --- a/net/base/host_resolver.h +++ b/net/base/host_resolver.h @@ -8,7 +8,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "net/base/address_family.h" #include "net/base/completion_callback.h" diff --git a/net/base/host_resolver_impl.h b/net/base/host_resolver_impl.h index 89d4f46..54e0b9e 100644 --- a/net/base/host_resolver_impl.h +++ b/net/base/host_resolver_impl.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,7 +8,7 @@ #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "net/base/capturing_net_log.h" #include "net/base/host_cache.h" diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc index 01c32f7..1093cdc 100644 --- a/net/base/host_resolver_impl_unittest.cc +++ b/net/base/host_resolver_impl_unittest.cc @@ -7,8 +7,8 @@ #include <string> #include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/ref_counted.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "net/base/address_list.h" diff --git a/net/base/host_resolver_proc.h b/net/base/host_resolver_proc.h index f20d71a..56259fa 100644 --- a/net/base/host_resolver_proc.h +++ b/net/base/host_resolver_proc.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,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/address_family.h" namespace net { diff --git a/net/base/io_buffer.h b/net/base/io_buffer.h index 527864b..a747ead 100644 --- a/net/base/io_buffer.h +++ b/net/base/io_buffer.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. @@ -8,9 +8,9 @@ #include <string> +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/pickle.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" namespace net { diff --git a/net/base/keygen_handler.h b/net/base/keygen_handler.h index 817720d..4dd7bbf 100644 --- a/net/base/keygen_handler.h +++ b/net/base/keygen_handler.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,7 +8,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "googleurl/src/gurl.h" diff --git a/net/base/keygen_handler_openssl.cc b/net/base/keygen_handler_openssl.cc index 73aabd7..0bfa734 100644 --- a/net/base/keygen_handler_openssl.cc +++ b/net/base/keygen_handler_openssl.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. @@ -8,8 +8,8 @@ #include "base/crypto/rsa_private_key.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/openssl_util.h" -#include "base/scoped_ptr.h" #include "net/base/openssl_private_key_store.h" namespace net { diff --git a/net/base/listen_socket.h b/net/base/listen_socket.h index 086705e..ad77b19 100644 --- a/net/base/listen_socket.h +++ b/net/base/listen_socket.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. @@ -25,7 +25,7 @@ #endif #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #if defined(OS_POSIX) struct event; // From libevent diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h index f54fc31..aaf9341 100644 --- a/net/base/listen_socket_unittest.h +++ b/net/base/listen_socket_unittest.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. @@ -17,8 +17,8 @@ #endif #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" diff --git a/net/base/mapped_host_resolver.h b/net/base/mapped_host_resolver.h index 0f84f6a..5ca5223 100644 --- a/net/base/mapped_host_resolver.h +++ b/net/base/mapped_host_resolver.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,7 +8,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/host_mapping_rules.h" #include "net/base/host_resolver.h" diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc index 7af6ba4..1f1c4cd 100644 --- a/net/base/mock_host_resolver.cc +++ b/net/base/mock_host_resolver.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/base/mock_host_resolver.h" +#include "base/memory/ref_counted.h" #include "base/string_split.h" #include "base/string_util.h" -#include "base/ref_counted.h" #include "base/threading/platform_thread.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/net/base/net_log.h b/net/base/net_log.h index 4946c76a..3df804a 100644 --- a/net/base/net_log.h +++ b/net/base/net_log.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" class Value; diff --git a/net/base/net_test_suite.h b/net/base/net_test_suite.h index 274d067..98c5bd5 100644 --- a/net/base/net_test_suite.h +++ b/net/base/net_test_suite.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_BASE_NET_TEST_SUITE_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/test/test_suite.h" #include "build/build_config.h" #include "net/base/mock_host_resolver.h" diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 959ee29..2123a0b 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -38,10 +38,10 @@ #include "base/i18n/time_formatting.h" #include "base/json/string_escape.h" #include "base/logging.h" +#include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/singleton.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc index ee6a5af..0455dab 100644 --- a/net/base/net_util_win.cc +++ b/net/base/net_util_win.cc @@ -9,7 +9,7 @@ #include <algorithm> #include "base/file_path.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" diff --git a/net/base/network_change_notifier_linux.h b/net/base/network_change_notifier_linux.h index 9344616..2a4b20b 100644 --- a/net/base/network_change_notifier_linux.h +++ b/net/base/network_change_notifier_linux.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 "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/network_change_notifier.h" namespace net { diff --git a/net/base/network_config_watcher_mac.h b/net/base/network_config_watcher_mac.h index 3bd55f9..5193a98 100644 --- a/net/base/network_config_watcher_mac.h +++ b/net/base/network_config_watcher_mac.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/message_loop.h" #include "base/mac/scoped_cftyperef.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace base { class Thread; diff --git a/net/base/openssl_memory_private_key_store.cc b/net/base/openssl_memory_private_key_store.cc index 5572b67..2d42e3e 100644 --- a/net/base/openssl_memory_private_key_store.cc +++ b/net/base/openssl_memory_private_key_store.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,8 +9,8 @@ #include "net/base/openssl_private_key_store.h" #include "base/logging.h" +#include "base/memory/singleton.h" #include "base/openssl_util.h" -#include "base/singleton.h" #include "base/synchronization/lock.h" #include "net/base/x509_certificate.h" diff --git a/net/base/registry_controlled_domain.cc b/net/base/registry_controlled_domain.cc index d01b3d1..e8bc423 100644 --- a/net/base/registry_controlled_domain.cc +++ b/net/base/registry_controlled_domain.cc @@ -40,7 +40,7 @@ #include "net/base/registry_controlled_domain.h" #include "base/logging.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_parse.h" diff --git a/net/base/scoped_cert_chain_context.h b/net/base/scoped_cert_chain_context.h index af60dd3..668e46e 100644 --- a/net/base/scoped_cert_chain_context.h +++ b/net/base/scoped_cert_chain_context.h @@ -1,4 +1,4 @@ -// Copyright (c) 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. @@ -9,7 +9,7 @@ #include <windows.h> #include <wincrypt.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace net { diff --git a/net/base/sdch_filter.h b/net/base/sdch_filter.h index 33aa46e..1ed6077 100644 --- a/net/base/sdch_filter.h +++ b/net/base/sdch_filter.h @@ -17,7 +17,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/filter.h" #include "net/base/sdch_manager.h" diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc index 44b7f62..9c97f86 100644 --- a/net/base/sdch_filter_unittest.cc +++ b/net/base/sdch_filter_unittest.cc @@ -15,7 +15,7 @@ #endif #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/filter.h" #include "net/base/io_buffer.h" #include "net/base/mock_filter_context.h" diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h index b37e4ad..4649c41 100644 --- a/net/base/sdch_manager.h +++ b/net/base/sdch_manager.h @@ -26,8 +26,8 @@ #include <string> #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 "googleurl/src/gurl.h" diff --git a/net/base/ssl_cert_request_info.h b/net/base/ssl_cert_request_info.h index a180ed9..cbff862 100644 --- a/net/base/ssl_cert_request_info.h +++ b/net/base/ssl_cert_request_info.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. @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" namespace net { diff --git a/net/base/ssl_client_auth_cache.h b/net/base/ssl_client_auth_cache.h index 6cc1d12..d66d727 100644 --- a/net/base/ssl_client_auth_cache.h +++ b/net/base/ssl_client_auth_cache.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. @@ -9,7 +9,7 @@ #include <string> #include <map> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/cert_database.h" namespace net { diff --git a/net/base/ssl_config_service.h b/net/base/ssl_config_service.h index 413d076..e0879ed 100644 --- a/net/base/ssl_config_service.h +++ b/net/base/ssl_config_service.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 <vector> #include "base/basictypes.h" +#include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/ref_counted.h" #include "net/base/x509_certificate.h" namespace net { diff --git a/net/base/ssl_info.h b/net/base/ssl_info.h index 4c68f06..1a85919 100644 --- a/net/base/ssl_info.h +++ b/net/base/ssl_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. @@ -6,7 +6,7 @@ #define NET_BASE_SSL_INFO_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" namespace net { diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc index c067b68..e61c8d2 100644 --- a/net/base/transport_security_state.cc +++ b/net/base/transport_security_state.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. @@ -8,7 +8,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/sha2.h" #include "base/string_number_conversions.h" #include "base/string_tokenizer.h" diff --git a/net/base/transport_security_state.h b/net/base/transport_security_state.h index 05061ca..18bf51c 100644 --- a/net/base/transport_security_state.h +++ b/net/base/transport_security_state.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. @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/time.h" namespace net { diff --git a/net/base/upload_data.h b/net/base/upload_data.h index b9cc864..7ef0750 100644 --- a/net/base/upload_data.h +++ b/net/base/upload_data.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. @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/gtest_prod_util.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "googleurl/src/gurl.h" #include "base/time.h" diff --git a/net/base/upload_data_stream.h b/net/base/upload_data_stream.h index decc3f6..30c17c2 100644 --- a/net/base/upload_data_stream.h +++ b/net/base/upload_data_stream.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_BASE_UPLOAD_DATA_STREAM_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/upload_data.h" namespace net { diff --git a/net/base/upload_data_stream_unittest.cc b/net/base/upload_data_stream_unittest.cc index 5f5cc6c..4a648f3 100644 --- a/net/base/upload_data_stream_unittest.cc +++ b/net/base/upload_data_stream_unittest.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/file_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" #include "net/base/net_errors.h" #include "net/base/upload_data.h" diff --git a/net/base/x509_certificate.cc b/net/base/x509_certificate.cc index 6c73b48..089bf096 100644 --- a/net/base/x509_certificate.cc +++ b/net/base/x509_certificate.cc @@ -10,8 +10,8 @@ #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/memory/singleton.h" #include "base/metrics/histogram.h" -#include "base/singleton.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/time.h" diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h index 818e96c..52bb9f1 100644 --- a/net/base/x509_certificate.h +++ b/net/base/x509_certificate.h @@ -12,7 +12,7 @@ #include <vector> #include "base/gtest_prod_util.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string_piece.h" #include "base/time.h" #include "net/base/x509_cert_types.h" diff --git a/net/base/x509_certificate_mac.cc b/net/base/x509_certificate_mac.cc index bc19399..4cecb50 100644 --- a/net/base/x509_certificate_mac.cc +++ b/net/base/x509_certificate_mac.cc @@ -14,9 +14,9 @@ #include "base/crypto/rsa_private_key.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/memory/singleton.h" #include "base/nss_util.h" #include "base/pickle.h" -#include "base/singleton.h" #include "base/mac/scoped_cftyperef.h" #include "base/sys_string_conversions.h" #include "net/base/cert_status_flags.h" diff --git a/net/base/x509_certificate_nss.cc b/net/base/x509_certificate_nss.cc index 7cc7ac9..d71381a 100644 --- a/net/base/x509_certificate_nss.cc +++ b/net/base/x509_certificate_nss.cc @@ -18,8 +18,8 @@ #include "base/crypto/rsa_private_key.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/pickle.h" -#include "base/scoped_ptr.h" #include "base/time.h" #include "base/nss_util.h" #include "net/base/cert_status_flags.h" diff --git a/net/base/x509_certificate_openssl.cc b/net/base/x509_certificate_openssl.cc index 6e82300..0d2c12e 100644 --- a/net/base/x509_certificate_openssl.cc +++ b/net/base/x509_certificate_openssl.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 <openssl/ssl.h> #include <openssl/x509v3.h> +#include "base/memory/singleton.h" #include "base/openssl_util.h" #include "base/pickle.h" -#include "base/singleton.h" #include "base/string_number_conversions.h" #include "net/base/cert_status_flags.h" #include "net/base/cert_verify_result.h" diff --git a/net/disk_cache/block_files.h b/net/disk_cache/block_files.h index d677ba3..5f1fa3c 100644 --- a/net/disk_cache/block_files.h +++ b/net/disk_cache/block_files.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. @@ -12,7 +12,7 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/disk_cache/addr.h" #include "net/disk_cache/mapped_file.h" diff --git a/net/disk_cache/cache_util_unittest.cc b/net/disk_cache/cache_util_unittest.cc index e616480..f359627 100644 --- a/net/disk_cache/cache_util_unittest.cc +++ b/net/disk_cache/cache_util_unittest.cc @@ -1,10 +1,10 @@ -// 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/disk_cache/cache_util.h" #include "base/file_util.h" -#include "base/scoped_temp_dir.h" +#include "base/memory/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/disk_cache/entry_impl.h b/net/disk_cache/entry_impl.h index 99e7b4e..fab676a 100644 --- a/net/disk_cache/entry_impl.h +++ b/net/disk_cache/entry_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-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_DISK_CACHE_ENTRY_IMPL_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/net_log.h" #include "net/disk_cache/disk_cache.h" #include "net/disk_cache/storage_block.h" diff --git a/net/disk_cache/file.h b/net/disk_cache/file.h index 129c3dd..86e6920 100644 --- a/net/disk_cache/file.h +++ b/net/disk_cache/file.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 @@ #define NET_DISK_CACHE_FILE_H_ #pragma once +#include "base/memory/ref_counted.h" #include "base/platform_file.h" -#include "base/ref_counted.h" class FilePath; diff --git a/net/disk_cache/mem_entry_impl.h b/net/disk_cache/mem_entry_impl.h index f195b75..c3872dd 100644 --- a/net/disk_cache/mem_entry_impl.h +++ b/net/disk_cache/mem_entry_impl.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-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 "base/hash_tables.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/net_log.h" #include "net/disk_cache/disk_cache.h" #include "testing/gtest/include/gtest/gtest_prod.h" diff --git a/net/disk_cache/rankings.h b/net/disk_cache/rankings.h index baf777e..f78c97e 100644 --- a/net/disk_cache/rankings.h +++ b/net/disk_cache/rankings.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 <list> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/disk_cache/addr.h" #include "net/disk_cache/mapped_file.h" #include "net/disk_cache/storage_block.h" diff --git a/net/disk_cache/stats.h b/net/disk_cache/stats.h index ebf0bc21..ba0d7dd 100644 --- a/net/disk_cache/stats.h +++ b/net/disk_cache/stats.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-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 <vector> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/disk_cache/stats_histogram.h" namespace disk_cache { diff --git a/net/disk_cache/trace.h b/net/disk_cache/trace.h index a5aa651..01369fb 100644 --- a/net/disk_cache/trace.h +++ b/net/disk_cache/trace.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. @@ -11,7 +11,7 @@ #pragma once #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" namespace disk_cache { diff --git a/net/ftp/ftp_network_layer.h b/net/ftp/ftp_network_layer.h index a4191f9..12ada88 100644 --- a/net/ftp/ftp_network_layer.h +++ b/net/ftp/ftp_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. @@ -6,7 +6,7 @@ #define NET_FTP_FTP_NETWORK_LAYER_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/ftp/ftp_transaction_factory.h" namespace net { diff --git a/net/ftp/ftp_network_session.h b/net/ftp/ftp_network_session.h index b53b5c0..2f6ede8 100644 --- a/net/ftp/ftp_network_session.h +++ b/net/ftp/ftp_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. @@ -6,7 +6,7 @@ #define NET_FTP_FTP_NETWORK_SESSION_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/ftp/ftp_auth_cache.h" namespace net { diff --git a/net/ftp/ftp_network_transaction.h b/net/ftp/ftp_network_transaction.h index c4516a4..5a69e8e 100644 --- a/net/ftp/ftp_network_transaction.h +++ b/net/ftp/ftp_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. @@ -9,8 +9,8 @@ #include <string> #include <utility> -#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 "net/base/address_list.h" #include "net/base/host_resolver.h" diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc index 1d86fba..3075a5f 100644 --- a/net/ftp/ftp_network_transaction_unittest.cc +++ b/net/ftp/ftp_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. @@ -6,7 +6,7 @@ #include "build/build_config.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/base/host_port_pair.h" 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; diff --git a/net/proxy/mock_proxy_resolver.h b/net/proxy/mock_proxy_resolver.h index bdc2ec6..e20c1ef 100644 --- a/net/proxy/mock_proxy_resolver.h +++ b/net/proxy/mock_proxy_resolver.h @@ -8,7 +8,7 @@ #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_resolver.h" diff --git a/net/proxy/multi_threaded_proxy_resolver.h b/net/proxy/multi_threaded_proxy_resolver.h index 4dbe878..00c3dbe 100644 --- a/net/proxy/multi_threaded_proxy_resolver.h +++ b/net/proxy/multi_threaded_proxy_resolver.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 <vector> #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/threading/non_thread_safe.h" #include "net/proxy/proxy_resolver.h" diff --git a/net/proxy/polling_proxy_config_service.cc b/net/proxy/polling_proxy_config_service.cc index 7526c19..d80b4f2 100644 --- a/net/proxy/polling_proxy_config_service.cc +++ b/net/proxy/polling_proxy_config_service.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/proxy/polling_proxy_config_service.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" #include "base/observer_list.h" -#include "base/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/worker_pool.h" #include "net/proxy/proxy_config.h" diff --git a/net/proxy/polling_proxy_config_service.h b/net/proxy/polling_proxy_config_service.h index b4295ec..37aedd4 100644 --- a/net/proxy/polling_proxy_config_service.h +++ b/net/proxy/polling_proxy_config_service.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_PROXY_POLLING_PROXY_CONFIG_SERVICE_H_ #pragma once +#include "base/memory/ref_counted.h" #include "base/time.h" -#include "base/ref_counted.h" #include "net/proxy/proxy_config_service.h" namespace net { diff --git a/net/proxy/proxy_config_service_linux.h b/net/proxy/proxy_config_service_linux.h index fa6c52d..5435226 100644 --- a/net/proxy/proxy_config_service_linux.h +++ b/net/proxy/proxy_config_service_linux.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. @@ -11,10 +11,10 @@ #include "base/basictypes.h" #include "base/environment.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/observer_list.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_server.h" diff --git a/net/proxy/proxy_config_service_mac.h b/net/proxy/proxy_config_service_mac.h index 68a7d22..6fb8fcd 100644 --- a/net/proxy/proxy_config_service_mac.h +++ b/net/proxy/proxy_config_service_mac.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. @@ -7,8 +7,8 @@ #pragma once #include "base/basictypes.h" +#include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/ref_counted.h" #include "net/base/network_config_watcher_mac.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service.h" diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc index 3c2fbff..0d581ea 100644 --- a/net/proxy/proxy_config_service_win.cc +++ b/net/proxy/proxy_config_service_win.cc @@ -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. @@ -8,7 +8,7 @@ #include <winhttp.h> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "base/stl_util-inl.h" diff --git a/net/proxy/proxy_resolver.h b/net/proxy/proxy_resolver.h index fcc2395..acdc253 100644 --- a/net/proxy/proxy_resolver.h +++ b/net/proxy/proxy_resolver.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. @@ -7,7 +7,7 @@ #pragma once #include "base/logging.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" diff --git a/net/proxy/proxy_resolver_js_bindings_unittest.cc b/net/proxy/proxy_resolver_js_bindings_unittest.cc index ecb36ca..e19bdde 100644 --- a/net/proxy/proxy_resolver_js_bindings_unittest.cc +++ b/net/proxy/proxy_resolver_js_bindings_unittest.cc @@ -1,10 +1,10 @@ -// 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/proxy/proxy_resolver_js_bindings.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "net/base/address_list.h" #include "net/base/mock_host_resolver.h" diff --git a/net/proxy/proxy_resolver_script_data.h b/net/proxy/proxy_resolver_script_data.h index 7b8118f..d8195bb 100644 --- a/net/proxy/proxy_resolver_script_data.h +++ b/net/proxy/proxy_resolver_script_data.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_PROXY_PROXY_RESOLVER_SCRIPT_DATA_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "googleurl/src/gurl.h" diff --git a/net/proxy/proxy_resolver_v8.h b/net/proxy/proxy_resolver_v8.h index 6cd340f..795944e 100644 --- a/net/proxy/proxy_resolver_v8.h +++ b/net/proxy/proxy_resolver_v8.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_PROXY_PROXY_RESOLVER_V8_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/proxy/proxy_resolver.h" namespace net { diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h index e3abb55..419293f 100644 --- a/net/proxy/proxy_script_fetcher_impl.h +++ b/net/proxy/proxy_script_fetcher_impl.h @@ -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/string16.h" #include "base/task.h" #include "base/time.h" diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 72b76ef..10ca883 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -9,8 +9,8 @@ #include <vector> #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/synchronization/waitable_event.h" #include "net/base/completion_callback.h" #include "net/base/network_change_notifier.h" diff --git a/net/proxy/sync_host_resolver_bridge.h b/net/proxy/sync_host_resolver_bridge.h index d3b9bb9..0e8e049 100644 --- a/net/proxy/sync_host_resolver_bridge.h +++ b/net/proxy/sync_host_resolver_bridge.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_PROXY_SYNC_HOST_RESOLVER_BRIDGE_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/host_resolver.h" class MessageLoop; diff --git a/net/server/http_server.h b/net/server/http_server.h index 270dea6..f94acc8 100644 --- a/net/server/http_server.h +++ b/net/server/http_server.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 <map> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/listen_socket.h" class HttpServerRequestInfo; diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h index 8c5da88..c66f50a 100644 --- a/net/socket/client_socket_handle.h +++ b/net/socket/client_socket_handle.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/logging.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/completion_callback.h" #include "net/base/load_states.h" diff --git a/net/socket/client_socket_pool.h b/net/socket/client_socket_pool.h index c889ab4..3066ee3 100644 --- a/net/socket/client_socket_pool.h +++ b/net/socket/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. @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/time.h" #include "base/template_util.h" #include "net/base/completion_callback.h" diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index 8fcb571..2382a3f 100644 --- a/net/socket/client_socket_pool_base.h +++ b/net/socket/client_socket_pool_base.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. // @@ -30,8 +30,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/task.h" #include "base/time.h" #include "base/timer.h" diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index 168f430..50b7f96 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_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,9 +6,9 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_vector.h" #include "base/message_loop.h" -#include "base/ref_counted.h" -#include "base/scoped_vector.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/threading/platform_thread.h" diff --git a/net/socket/client_socket_pool_histograms.h b/net/socket/client_socket_pool_histograms.h index ace8a0d..493d34a 100644 --- a/net/socket/client_socket_pool_histograms.h +++ b/net/socket/client_socket_pool_histograms.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/memory/ref_counted.h" #include "base/time.h" -#include "base/ref_counted.h" namespace base { class Histogram; diff --git a/net/socket/client_socket_pool_manager.h b/net/socket/client_socket_pool_manager.h index 45a0c23..5415578 100644 --- a/net/socket/client_socket_pool_manager.h +++ b/net/socket/client_socket_pool_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. // @@ -12,8 +12,8 @@ #include <map> #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/stl_util-inl.h" #include "base/template_util.h" #include "base/threading/non_thread_safe.h" diff --git a/net/socket/dns_cert_provenance_checker.cc b/net/socket/dns_cert_provenance_checker.cc index 33487c5..dfa86d2 100644 --- a/net/socket/dns_cert_provenance_checker.cc +++ b/net/socket/dns_cert_provenance_checker.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. @@ -21,8 +21,8 @@ #include "base/crypto/encryptor.h" #include "base/crypto/symmetric_key.h" #include "base/lazy_instance.h" +#include "base/memory/scoped_ptr.h" #include "base/pickle.h" -#include "base/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "net/base/completion_callback.h" #include "net/base/dns_util.h" diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc index 768542a..3c8a7e1 100644 --- a/net/socket/nss_ssl_util.cc +++ b/net/socket/nss_ssl_util.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,8 +13,8 @@ #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/memory/singleton.h" #include "base/nss_util.h" -#include "base/singleton.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" #include "net/base/net_errors.h" diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index c661ebb..69daad9 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.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. @@ -14,10 +14,10 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/logging.h" -#include "base/scoped_ptr.h" -#include "base/scoped_vector.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/scoped_vector.h" +#include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "base/weak_ptr.h" #include "net/base/address_list.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h index e26b6c1..81804492 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_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,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 "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h index fc9a5c0..5c93468 100644 --- a/net/socket/socks_client_socket.h +++ b/net/socket/socks_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. @@ -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 "googleurl/src/gurl.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h index 5608c20..d0e8699 100644 --- a/net/socket/socks_client_socket_pool.h +++ b/net/socket/socks_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. @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.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/base/host_resolver.h" diff --git a/net/socket/ssl_client_socket_mac.h b/net/socket/ssl_client_socket_mac.h index 86b7be7..058d1a3 100644 --- a/net/socket/ssl_client_socket_mac.h +++ b/net/socket/ssl_client_socket_mac.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. @@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/cert_verify_result.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 892fddc..9923025 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -66,9 +66,9 @@ #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/memory/singleton.h" #include "base/metrics/histogram.h" #include "base/nss_util.h" -#include "base/singleton.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h index b3a1feb..35941ff 100644 --- a/net/socket/ssl_client_socket_nss.h +++ b/net/socket/ssl_client_socket_nss.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. @@ -14,7 +14,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" #include "base/time.h" diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index e0534d0..eefc839 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.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. @@ -10,9 +10,9 @@ #include <openssl/ssl.h> #include <openssl/err.h> +#include "base/memory/singleton.h" #include "base/metrics/histogram.h" #include "base/openssl_util.h" -#include "base/singleton.h" #include "base/synchronization/lock.h" #include "net/base/cert_verifier.h" #include "net/base/net_errors.h" diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h index d59b507..c4fb8dc 100644 --- a/net/socket/ssl_client_socket_openssl.h +++ b/net/socket/ssl_client_socket_openssl.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,7 +8,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/cert_verify_result.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h index 41cf2a7..fdec6d6 100644 --- a/net/socket/ssl_client_socket_pool.h +++ b/net/socket/ssl_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. @@ -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/time.h" #include "net/base/host_resolver.h" #include "net/base/ssl_config_service.h" diff --git a/net/socket/ssl_client_socket_win.h b/net/socket/ssl_client_socket_win.h index 2bb1853..f9a6f94 100644 --- a/net/socket/ssl_client_socket_win.h +++ b/net/socket/ssl_client_socket_win.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. @@ -14,7 +14,7 @@ #include <string> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/cert_verify_result.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" diff --git a/net/socket/ssl_host_info.h b/net/socket/ssl_host_info.h index b99bf87..8fe75c0 100644 --- a/net/socket/ssl_host_info.h +++ b/net/socket/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. @@ -8,8 +8,8 @@ #include <string> #include <vector> -#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/cert_verifier.h" #include "net/base/cert_verify_result.h" diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc index 4d33863..7d65ea9 100644 --- a/net/socket/ssl_server_socket_nss.cc +++ b/net/socket/ssl_server_socket_nss.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. @@ -30,8 +30,8 @@ #include <limits> #include "base/crypto/rsa_private_key.h" +#include "base/memory/ref_counted.h" #include "base/nss_util_internal.h" -#include "base/ref_counted.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h index 1289272..4f18916 100644 --- a/net/socket/ssl_server_socket_nss.h +++ b/net/socket/ssl_server_socket_nss.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 <nspr.h> #include <nss.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" #include "net/base/net_log.h" diff --git a/net/socket/tcp_client_socket_libevent.h b/net/socket/tcp_client_socket_libevent.h index 4f002aa..2d9ea2b 100644 --- a/net/socket/tcp_client_socket_libevent.h +++ b/net/socket/tcp_client_socket_libevent.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,9 +6,9 @@ #define NET_SOCKET_TCP_CLIENT_SOCKET_LIBEVENT_H_ #pragma once +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" diff --git a/net/socket/tcp_client_socket_pool.h b/net/socket/tcp_client_socket_pool.h index 245262e..8dca04b 100644 --- a/net/socket/tcp_client_socket_pool.h +++ b/net/socket/tcp_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 "base/timer.h" #include "net/base/host_port_pair.h" diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc index 5315f45..9d28254 100644 --- a/net/socket/tcp_client_socket_win.cc +++ b/net/socket/tcp_client_socket_win.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. @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/memory_debug.h" +#include "base/memory/memory_debug.h" #include "base/metrics/stats_counters.h" #include "base/string_util.h" #include "base/sys_info.h" diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h index 7b7599e..9e85167 100644 --- a/net/socket_stream/socket_stream.h +++ b/net/socket_stream/socket_stream.h @@ -10,9 +10,9 @@ #include <map> #include <string> -#include "base/linked_ptr.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/linked_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "base/task.h" #include "net/base/address_list.h" diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc index 6636233..b52945a 100644 --- a/net/socket_stream/socket_stream_job.cc +++ b/net/socket_stream/socket_stream_job.cc @@ -1,10 +1,10 @@ -// 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/socket_stream/socket_stream_job.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" #include "net/socket_stream/socket_stream_job_manager.h" namespace net { diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h index 973c20a..9a4577e 100644 --- a/net/socket_stream/socket_stream_job.h +++ b/net/socket_stream/socket_stream_job.h @@ -8,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "net/socket_stream/socket_stream.h" diff --git a/net/socket_stream/socket_stream_job_manager.cc b/net/socket_stream/socket_stream_job_manager.cc index 105fc3e..7f66a4a 100644 --- a/net/socket_stream/socket_stream_job_manager.cc +++ b/net/socket_stream/socket_stream_job_manager.cc @@ -1,10 +1,10 @@ -// 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/socket_stream/socket_stream_job_manager.h" -#include "base/singleton.h" +#include "base/memory/singleton.h" namespace net { diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc index 9958c4c..9cc93d5 100644 --- a/net/spdy/spdy_framer.cc +++ b/net/spdy/spdy_framer.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. @@ -8,8 +8,8 @@ #include "net/spdy/spdy_framer.h" +#include "base/memory/scoped_ptr.h" #include "base/metrics/stats_counters.h" -#include "base/scoped_ptr.h" #include "base/third_party/valgrind/memcheck.h" #include "net/spdy/spdy_frame_builder.h" #include "net/spdy/spdy_bitmasks.h" diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h index 85805f3..688c611 100644 --- a/net/spdy/spdy_framer.h +++ b/net/spdy/spdy_framer.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. @@ -18,7 +18,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/spdy/spdy_protocol.h" typedef struct z_stream_s z_stream; // Forward declaration for zlib. diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc index b4345c1..a4f7b81 100644 --- a/net/spdy/spdy_framer_test.cc +++ b/net/spdy/spdy_framer_test.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 <algorithm> #include <iostream> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/spdy/spdy_framer.h" #include "net/spdy/spdy_protocol.h" #include "net/spdy/spdy_frame_builder.h" diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h index 4c00e0f..6bc5053 100644 --- a/net/spdy/spdy_http_stream.h +++ b/net/spdy/spdy_http_stream.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/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/task.h" #include "net/base/completion_callback.h" #include "net/base/net_log.h" diff --git a/net/spdy/spdy_io_buffer.h b/net/spdy/spdy_io_buffer.h index 23d6465..a541bda 100644 --- a/net/spdy/spdy_io_buffer.h +++ b/net/spdy/spdy_io_buffer.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. @@ -6,7 +6,7 @@ #define NET_SPDY_SPDY_IO_BUFFER_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/io_buffer.h" namespace net { diff --git a/net/spdy/spdy_protocol_test.cc b/net/spdy/spdy_protocol_test.cc index 40ba3df..8b620e2 100644 --- a/net/spdy/spdy_protocol_test.cc +++ b/net/spdy/spdy_protocol_test.cc @@ -1,10 +1,10 @@ -// 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/spdy/spdy_protocol.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/spdy/spdy_bitmasks.h" #include "net/spdy/spdy_framer.h" #include "testing/platform_test.h" diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h index 69261d3..d57b10f 100644 --- a/net/spdy/spdy_proxy_client_socket.h +++ b/net/spdy/spdy_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. @@ -10,7 +10,7 @@ #include <list> #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/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 048c837..429d6e4 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.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/spdy/spdy_session.h" #include "base/basictypes.h" -#include "base/linked_ptr.h" #include "base/logging.h" +#include "base/memory/linked_ptr.h" #include "base/message_loop.h" #include "base/metrics/field_trial.h" #include "base/metrics/stats_counters.h" diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index b1abb13..81319b9 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_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. @@ -13,8 +13,8 @@ #include <string> #include "base/gtest_prod_util.h" -#include "base/linked_ptr.h" -#include "base/ref_counted.h" +#include "base/memory/linked_ptr.h" +#include "base/memory/ref_counted.h" #include "base/task.h" #include "net/base/io_buffer.h" #include "net/base/load_states.h" diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h index eb127b5..7a08861 100644 --- a/net/spdy/spdy_session_pool.h +++ b/net/spdy/spdy_session_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. @@ -12,8 +12,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 "net/base/cert_database.h" #include "net/base/host_port_pair.h" #include "net/base/ip_endpoint.h" diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h index 6d6b09c..186d0ec 100644 --- a/net/spdy/spdy_stream.h +++ b/net/spdy/spdy_stream.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,9 +10,9 @@ #include <vector> #include "base/basictypes.h" -#include "base/linked_ptr.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/linked_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "net/base/bandwidth_metrics.h" #include "net/base/io_buffer.h" diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc index a7b4fac..327d197 100644 --- a/net/spdy/spdy_stream_unittest.cc +++ b/net/spdy/spdy_stream_unittest.cc @@ -1,9 +1,9 @@ -// 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/memory/ref_counted.h" #include "net/spdy/spdy_stream.h" -#include "base/ref_counted.h" #include "net/spdy/spdy_http_utils.h" #include "net/spdy/spdy_session.h" #include "net/spdy/spdy_test_util.h" diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc index df404ad..0eec816 100644 --- a/net/test/python_utils.cc +++ b/net/test/python_utils.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,8 +9,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" const char kPythonPathEnv[] = "PYTHONPATH"; diff --git a/net/test/python_utils_unittest.cc b/net/test/python_utils_unittest.cc index d0e568d..0114774 100644 --- a/net/test/python_utils_unittest.cc +++ b/net/test/python_utils_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. @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/environment.h" #include "base/file_path.h" +#include "base/memory/scoped_ptr.h" #include "base/process_util.h" -#include "base/scoped_ptr.h" #include "base/stringprintf.h" #include "base/string_util.h" #include "net/test/python_utils.h" diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 8f5f3d2..de55808 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -20,8 +20,8 @@ #include "base/json/json_reader.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h index ea02bf8..f41c60e 100644 --- a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h +++ b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h @@ -41,7 +41,7 @@ #include <vector> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/base/cert_database.h" typedef struct CERTCertificateStr CERTCertificate; diff --git a/net/third_party/mozilla_security_manager/nsPKCS12Blob.h b/net/third_party/mozilla_security_manager/nsPKCS12Blob.h index f625b20..3270469 100644 --- a/net/third_party/mozilla_security_manager/nsPKCS12Blob.h +++ b/net/third_party/mozilla_security_manager/nsPKCS12Blob.h @@ -41,8 +41,8 @@ #include <string> #include <vector> +#include "base/memory/ref_counted.h" #include "base/string16.h" -#include "base/ref_counted.h" typedef struct CERTCertificateStr CERTCertificate; typedef struct PK11SlotInfoStr PK11SlotInfo; diff --git a/net/tools/dump_cache/upgrade.cc b/net/tools/dump_cache/upgrade.cc index 6d79b73..80d97b3 100644 --- a/net/tools/dump_cache/upgrade.cc +++ b/net/tools/dump_cache/upgrade.cc @@ -4,8 +4,8 @@ #include "base/file_path.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/threading/thread.h" diff --git a/net/tools/fetch/fetch_server.cc b/net/tools/fetch/fetch_server.cc index ca058f1..830cd18 100644 --- a/net/tools/fetch/fetch_server.cc +++ b/net/tools/fetch/fetch_server.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 "base/at_exit.h" #include "base/command_line.h" +#include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/metrics/stats_counters.h" -#include "base/singleton.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/net/tools/fetch/http_server.h b/net/tools/fetch/http_server.h index fc37728..a31673c 100644 --- a/net/tools/fetch/http_server.h +++ b/net/tools/fetch/http_server.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 "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/tools/fetch/http_session.h" // Implements a simple, single-threaded HttpServer. diff --git a/net/tools/flip_server/epoll_server.h b/net/tools/flip_server/epoll_server.h index c50afae..2af9fcf 100644 --- a/net/tools/flip_server/epoll_server.h +++ b/net/tools/flip_server/epoll_server.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. @@ -36,7 +36,7 @@ #endif #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include <sys/epoll.h> namespace net { diff --git a/net/tools/flip_server/ring_buffer.h b/net/tools/flip_server/ring_buffer.h index ac482b6..be4435b 100644 --- a/net/tools/flip_server/ring_buffer.h +++ b/net/tools/flip_server/ring_buffer.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. @@ -6,7 +6,7 @@ #define NET_TOOLS_FLIP_SERVER_RING_BUFFER_H__ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/tools/flip_server/buffer_interface.h" namespace net { diff --git a/net/udp/udp_socket_libevent.h b/net/udp/udp_socket_libevent.h index e51dc22..e33e9fd 100644 --- a/net/udp/udp_socket_libevent.h +++ b/net/udp/udp_socket_libevent.h @@ -6,9 +6,9 @@ #define NET_UDP_UDP_SOCKET_LIBEVENT_H_ #pragma once +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "net/base/completion_callback.h" #include "net/base/ip_endpoint.h" diff --git a/net/udp/udp_socket_win.cc b/net/udp/udp_socket_win.cc index 2e2271e..a35417b 100644 --- a/net/udp/udp_socket_win.cc +++ b/net/udp/udp_socket_win.cc @@ -8,8 +8,8 @@ #include "base/eintr_wrapper.h" #include "base/logging.h" +#include "base/memory/memory_debug.h" #include "base/message_loop.h" -#include "base/memory_debug.h" #include "base/metrics/stats_counters.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" diff --git a/net/udp/udp_socket_win.h b/net/udp/udp_socket_win.h index fde423e..96dc55f 100644 --- a/net/udp/udp_socket_win.h +++ b/net/udp/udp_socket_win.h @@ -8,8 +8,8 @@ #include <winsock2.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/threading/non_thread_safe.h" #include "base/win/object_watcher.h" #include "net/base/completion_callback.h" diff --git a/net/url_request/https_prober.cc b/net/url_request/https_prober.cc index ecf33985..bc7ba04 100644 --- a/net/url_request/https_prober.cc +++ b/net/url_request/https_prober.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/singleton.h" +#include "base/memory/singleton.h" #include "net/url_request/https_prober.h" #include "net/url_request/url_request.h" diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 88044b4..17e23a5 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -5,9 +5,9 @@ #include "net/url_request/url_request.h" #include "base/compiler_specific.h" +#include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/metrics/stats_counters.h" -#include "base/singleton.h" #include "base/synchronization/lock.h" #include "net/base/host_port_pair.h" #include "net/base/load_flags.h" diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index c2a6c32..f42e60b 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -11,9 +11,9 @@ #include <vector> #include "base/debug/leak_tracker.h" -#include "base/linked_ptr.h" #include "base/logging.h" -#include "base/ref_counted.h" +#include "base/memory/linked_ptr.h" +#include "base/memory/ref_counted.h" #include "base/string16.h" #include "base/threading/non_thread_safe.h" #include "googleurl/src/gurl.h" diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h index ef4a357..ea80143 100644 --- a/net/url_request/url_request_context.h +++ b/net/url_request/url_request_context.h @@ -11,7 +11,7 @@ #define NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" #include "net/base/net_log.h" #include "net/base/ssl_config_service.h" diff --git a/net/url_request/url_request_context_storage.h b/net/url_request/url_request_context_storage.h index faa6c69..fa096c1 100644 --- a/net/url_request/url_request_context_storage.h +++ b/net/url_request/url_request_context_storage.h @@ -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" namespace net { diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h index 0935117..6e44745 100644 --- a/net/url_request/url_request_http_job.h +++ b/net/url_request/url_request_http_job.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "base/task.h" #include "base/time.h" diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h index f48a7fb..7968fbc 100644 --- a/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h @@ -9,8 +9,8 @@ #include <string> #include <vector> -#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/task.h" #include "base/time.h" diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc index 8a765b0..06891b4 100644 --- a/net/url_request/url_request_job_manager.cc +++ b/net/url_request/url_request_job_manager.cc @@ -6,8 +6,8 @@ #include <algorithm> +#include "base/memory/singleton.h" #include "build/build_config.h" -#include "base/singleton.h" #include "base/string_util.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" diff --git a/net/url_request/url_request_throttler_entry_interface.h b/net/url_request/url_request_throttler_entry_interface.h index 0e329dd..2b56506 100644 --- a/net/url_request/url_request_throttler_entry_interface.h +++ b/net/url_request/url_request_throttler_entry_interface.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/time.h" namespace net { diff --git a/net/url_request/url_request_throttler_header_adapter.h b/net/url_request/url_request_throttler_header_adapter.h index 3b0211d..6226bdf 100644 --- a/net/url_request/url_request_throttler_header_adapter.h +++ b/net/url_request/url_request_throttler_header_adapter.h @@ -8,7 +8,7 @@ #include <string> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/url_request/url_request_throttler_header_interface.h" namespace net { diff --git a/net/url_request/url_request_throttler_manager.h b/net/url_request/url_request_throttler_manager.h index bef8824..cae4020 100644 --- a/net/url_request/url_request_throttler_manager.h +++ b/net/url_request/url_request_throttler_manager.h @@ -11,8 +11,8 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" -#include "base/singleton.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/singleton.h" #include "base/threading/non_thread_safe.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_throttler_entry.h" diff --git a/net/url_request/url_request_throttler_unittest.cc b/net/url_request/url_request_throttler_unittest.cc index 6d96615..5f8f2ee 100644 --- a/net/url_request/url_request_throttler_unittest.cc +++ b/net/url_request/url_request_throttler_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/memory/scoped_ptr.h" #include "base/pickle.h" -#include "base/scoped_ptr.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/time.h" diff --git a/net/websockets/websocket.h b/net/websockets/websocket.h index f4c1168..2490a54 100644 --- a/net/websockets/websocket.h +++ b/net/websockets/websocket.h @@ -15,8 +15,8 @@ #include <deque> #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 "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/socket_stream/socket_stream.h" diff --git a/net/websockets/websocket_frame_handler.h b/net/websockets/websocket_frame_handler.h index ec5762d..b193e4a 100644 --- a/net/websockets/websocket_frame_handler.h +++ b/net/websockets/websocket_frame_handler.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 <vector> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" namespace net { diff --git a/net/websockets/websocket_frame_handler_unittest.cc b/net/websockets/websocket_frame_handler_unittest.cc index 52d70de..9dad139 100644 --- a/net/websockets/websocket_frame_handler_unittest.cc +++ b/net/websockets/websocket_frame_handler_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/io_buffer.h" #include "net/websockets/websocket_frame_handler.h" diff --git a/net/websockets/websocket_handshake.cc b/net/websockets/websocket_handshake.cc index f86f6ac..5698730 100644 --- a/net/websockets/websocket_handshake.cc +++ b/net/websockets/websocket_handshake.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,8 +9,8 @@ #include "base/logging.h" #include "base/md5.h" +#include "base/memory/ref_counted.h" #include "base/rand_util.h" -#include "base/ref_counted.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/net/websockets/websocket_handshake.h b/net/websockets/websocket_handshake.h index b74f9be7..ddb59af 100644 --- a/net/websockets/websocket_handshake.h +++ b/net/websockets/websocket_handshake.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/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" namespace net { diff --git a/net/websockets/websocket_handshake_draft75.cc b/net/websockets/websocket_handshake_draft75.cc index a504267..34ecda8 100644 --- a/net/websockets/websocket_handshake_draft75.cc +++ b/net/websockets/websocket_handshake_draft75.cc @@ -1,10 +1,10 @@ -// 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/websockets/websocket_handshake_draft75.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" diff --git a/net/websockets/websocket_handshake_draft75_unittest.cc b/net/websockets/websocket_handshake_draft75_unittest.cc index aff75ad..f509f55 100644 --- a/net/websockets/websocket_handshake_draft75_unittest.cc +++ b/net/websockets/websocket_handshake_draft75_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 <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/websockets/websocket_handshake_draft75.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/net/websockets/websocket_handshake_handler.h b/net/websockets/websocket_handshake_handler.h index b191dba..855d12f 100644 --- a/net/websockets/websocket_handshake_handler.h +++ b/net/websockets/websocket_handshake_handler.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. // @@ -17,7 +17,7 @@ #include <string> #include <vector> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "net/http/http_request_info.h" #include "net/http/http_response_info.h" #include "net/spdy/spdy_framer.h" diff --git a/net/websockets/websocket_handshake_unittest.cc b/net/websockets/websocket_handshake_unittest.cc index df3914e..eb3ada8 100644 --- a/net/websockets/websocket_handshake_unittest.cc +++ b/net/websockets/websocket_handshake_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 <vector> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc index 37013b9..a6f333a 100644 --- a/net/websockets/websocket_job_unittest.cc +++ b/net/websockets/websocket_job_unittest.cc @@ -5,7 +5,7 @@ #include <string> #include <vector> -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string_split.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" diff --git a/net/websockets/websocket_net_log_params.h b/net/websockets/websocket_net_log_params.h index 1da234c..2bbad5b 100644 --- a/net/websockets/websocket_net_log_params.h +++ b/net/websockets/websocket_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. @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/net/websockets/websocket_net_log_params_unittest.cc b/net/websockets/websocket_net_log_params_unittest.cc index 7339962..f3a5751 100644 --- a/net/websockets/websocket_net_log_params_unittest.cc +++ b/net/websockets/websocket_net_log_params_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/ref_counted.h" -#include "base/scoped_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" #include "net/websockets/websocket_net_log_params.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/websockets/websocket_throttle.cc b/net/websockets/websocket_throttle.cc index c714de6..510dea4 100644 --- a/net/websockets/websocket_throttle.cc +++ b/net/websockets/websocket_throttle.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. @@ -7,9 +7,9 @@ #include <string> #include "base/hash_tables.h" +#include "base/memory/ref_counted.h" +#include "base/memory/singleton.h" #include "base/message_loop.h" -#include "base/ref_counted.h" -#include "base/singleton.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" |