summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome_frame/urlmon_upload_data_stream.h3
-rw-r--r--net/android/network_change_notifier_android.h1
-rw-r--r--net/base/crl_set.h1
-rw-r--r--net/base/host_resolver.h1
-rw-r--r--net/base/multi_threaded_cert_verifier.h9
-rw-r--r--net/base/upload_data_stream.h2
-rw-r--r--net/curvecp/packetizer.h3
-rw-r--r--net/disk_cache/stats.h3
-rw-r--r--net/dns/dns_config_service_posix.h1
-rw-r--r--net/dns/dns_session.h2
-rw-r--r--net/http/disk_cache_based_ssl_host_info.h4
-rw-r--r--net/http/http_pipelined_stream.h1
-rw-r--r--net/proxy/dhcp_proxy_script_fetcher_win.h2
-rw-r--r--net/proxy/proxy_script_decider.h10
-rw-r--r--net/proxy/sync_host_resolver_bridge.h3
-rw-r--r--net/server/web_socket.h5
-rw-r--r--net/socket/ssl_host_info.h3
-rw-r--r--net/spdy/spdy_session_pool.h1
-rw-r--r--net/spdy/spdy_stream.h1
-rw-r--r--net/url_request/url_request_throttler_manager.h2
20 files changed, 23 insertions, 35 deletions
diff --git a/chrome_frame/urlmon_upload_data_stream.h b/chrome_frame/urlmon_upload_data_stream.h
index 36ea386c..497fdb4 100644
--- a/chrome_frame/urlmon_upload_data_stream.h
+++ b/chrome_frame/urlmon_upload_data_stream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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,6 +10,7 @@
#include <atlcom.h>
#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
#include "chrome_frame/stream_impl.h"
#include "net/base/upload_data.h"
#include "net/base/upload_data_stream.h"
diff --git a/net/android/network_change_notifier_android.h b/net/android/network_change_notifier_android.h
index 5691a00..f73168a 100644
--- a/net/android/network_change_notifier_android.h
+++ b/net/android/network_change_notifier_android.h
@@ -9,7 +9,6 @@
#include "base/android/scoped_java_ref.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
#include "net/base/network_change_notifier.h"
namespace net {
diff --git a/net/base/crl_set.h b/net/base/crl_set.h
index c9b3137..2e640d1 100644
--- a/net/base/crl_set.h
+++ b/net/base/crl_set.h
@@ -12,7 +12,6 @@
#include <vector>
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/string_piece.h"
#include "base/time.h"
#include "net/base/net_export.h"
diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h
index 300bd34..b199491 100644
--- a/net/base/host_resolver.h
+++ b/net/base/host_resolver.h
@@ -8,7 +8,6 @@
#include <string>
-#include "base/memory/scoped_ptr.h"
#include "net/base/address_family.h"
#include "net/base/completion_callback.h"
#include "net/base/host_port_pair.h"
diff --git a/net/base/multi_threaded_cert_verifier.h b/net/base/multi_threaded_cert_verifier.h
index 10c9421..632ae44 100644
--- a/net/base/multi_threaded_cert_verifier.h
+++ b/net/base/multi_threaded_cert_verifier.h
@@ -12,7 +12,6 @@
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "net/base/cert_database.h"
#include "net/base/cert_verifier.h"
@@ -31,10 +30,10 @@ class CertVerifyProc;
// MultiThreadedCertVerifier is a CertVerifier implementation that runs
// synchronous CertVerifier implementations on worker threads.
-class NET_EXPORT_PRIVATE MultiThreadedCertVerifier :
- public CertVerifier,
- NON_EXPORTED_BASE(public base::NonThreadSafe),
- public CertDatabase::Observer {
+class NET_EXPORT_PRIVATE MultiThreadedCertVerifier
+ : public CertVerifier,
+ NON_EXPORTED_BASE(public base::NonThreadSafe),
+ public CertDatabase::Observer {
public:
MultiThreadedCertVerifier();
diff --git a/net/base/upload_data_stream.h b/net/base/upload_data_stream.h
index 65d4236..fcd3321 100644
--- a/net/base/upload_data_stream.h
+++ b/net/base/upload_data_stream.h
@@ -6,7 +6,7 @@
#define NET_BASE_UPLOAD_DATA_STREAM_H_
#pragma once
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "net/base/net_export.h"
#include "net/base/upload_data.h"
diff --git a/net/curvecp/packetizer.h b/net/curvecp/packetizer.h
index c366095..bd4c27f 100644
--- a/net/curvecp/packetizer.h
+++ b/net/curvecp/packetizer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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,6 @@
#pragma once
#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
#include "net/base/completion_callback.h"
#include "net/curvecp/connection_key.h"
diff --git a/net/disk_cache/stats.h b/net/disk_cache/stats.h
index 1f5aa59..16c74fd 100644
--- a/net/disk_cache/stats.h
+++ b/net/disk_cache/stats.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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,6 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
#include "net/disk_cache/stats_histogram.h"
namespace disk_cache {
diff --git a/net/dns/dns_config_service_posix.h b/net/dns/dns_config_service_posix.h
index 30588efc..61d7241 100644
--- a/net/dns/dns_config_service_posix.h
+++ b/net/dns/dns_config_service_posix.h
@@ -11,7 +11,6 @@
#include <resolv.h>
#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
#include "net/base/net_export.h"
#include "net/dns/dns_config_service.h"
diff --git a/net/dns/dns_session.h b/net/dns/dns_session.h
index aa070ac..986a381 100644
--- a/net/dns/dns_session.h
+++ b/net/dns/dns_session.h
@@ -7,7 +7,6 @@
#pragma once
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#include "net/base/net_export.h"
#include "net/base/rand_callback.h"
@@ -67,4 +66,3 @@ class NET_EXPORT_PRIVATE DnsSession
} // namespace net
#endif // NET_DNS_DNS_SESSION_H_
-
diff --git a/net/http/disk_cache_based_ssl_host_info.h b/net/http/disk_cache_based_ssl_host_info.h
index 72c256f..3496ed6 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) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 @@
#include <string>
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "net/base/completion_callback.h"
diff --git a/net/http/http_pipelined_stream.h b/net/http/http_pipelined_stream.h
index 76897ac..83fca26 100644
--- a/net/http/http_pipelined_stream.h
+++ b/net/http/http_pipelined_stream.h
@@ -9,7 +9,6 @@
#include <string>
#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
#include "net/base/net_log.h"
#include "net/http/http_stream.h"
#include "net/socket/ssl_client_socket.h"
diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.h b/net/proxy/dhcp_proxy_script_fetcher_win.h
index c6085e9..29b98e8 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_win.h
+++ b/net/proxy/dhcp_proxy_script_fetcher_win.h
@@ -9,7 +9,7 @@
#include <set>
#include <string>
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
#include "base/message_loop_proxy.h"
#include "base/threading/non_thread_safe.h"
diff --git a/net/proxy/proxy_script_decider.h b/net/proxy/proxy_script_decider.h
index 14aeb2e..7f680db 100644
--- a/net/proxy/proxy_script_decider.h
+++ b/net/proxy/proxy_script_decider.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
-#ifndef NET_PROXY_SCRIPT_DECIDER_H
-#define NET_PROXY_SCRIPT_DECIDER_H
+#ifndef NET_PROXY_PROXY_SCRIPT_DECIDER_H_
+#define NET_PROXY_PROXY_SCRIPT_DECIDER_H_
#pragma once
#include <vector>
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "base/string16.h"
#include "base/time.h"
#include "base/timer.h"
@@ -176,4 +176,4 @@ class NET_EXPORT_PRIVATE ProxyScriptDecider {
} // namespace net
-#endif // NET_PROXY_SCRIPT_DECIDER_H
+#endif // NET_PROXY_PROXY_SCRIPT_DECIDER_H_
diff --git a/net/proxy/sync_host_resolver_bridge.h b/net/proxy/sync_host_resolver_bridge.h
index ff93efa..2d8d4cf 100644
--- a/net/proxy/sync_host_resolver_bridge.h
+++ b/net/proxy/sync_host_resolver_bridge.h
@@ -6,7 +6,8 @@
#define NET_PROXY_SYNC_HOST_RESOLVER_BRIDGE_H_
#pragma once
-#include "base/memory/scoped_ptr.h"
+#include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
#include "net/proxy/sync_host_resolver.h"
class MessageLoop;
diff --git a/net/server/web_socket.h b/net/server/web_socket.h
index 66ad789..a4221e4 100644
--- a/net/server/web_socket.h
+++ b/net/server/web_socket.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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,6 @@
#include <string>
#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
namespace net {
@@ -44,4 +43,4 @@ class WebSocket {
} // namespace net
-#endif // NET_SERVER_WEB_SOCKET_H_
+#endif // NET_SERVER_WEB_SOCKET_H_
diff --git a/net/socket/ssl_host_info.h b/net/socket/ssl_host_info.h
index af2c418..d73cc6d 100644
--- a/net/socket/ssl_host_info.h
+++ b/net/socket/ssl_host_info.h
@@ -9,7 +9,6 @@
#include <vector>
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time.h"
#include "net/base/cert_verifier.h"
@@ -32,7 +31,7 @@ class NET_EXPORT_PRIVATE SSLHostInfo {
public:
SSLHostInfo(const std::string& hostname,
const SSLConfig& ssl_config,
- CertVerifier *certVerifier);
+ CertVerifier* certVerifier);
virtual ~SSLHostInfo();
// Start will commence the lookup. This must be called before any other
diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
index 2ab32f0..75b157c 100644
--- a/net/spdy/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.h
@@ -13,7 +13,6 @@
#include "base/basictypes.h"
#include "base/gtest_prod_util.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 5f5ceda..3e81ecf 100644
--- a/net/spdy/spdy_stream.h
+++ b/net/spdy/spdy_stream.h
@@ -12,7 +12,6 @@
#include "base/basictypes.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/url_request/url_request_throttler_manager.h b/net/url_request/url_request_throttler_manager.h
index d4643a0..97016a5 100644
--- a/net/url_request/url_request_throttler_manager.h
+++ b/net/url_request/url_request_throttler_manager.h
@@ -11,7 +11,7 @@
#include <string>
#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "base/threading/non_thread_safe.h"
#include "base/threading/platform_thread.h"
#include "googleurl/src/gurl.h"
generated by cgit v1.1 at 2025-01-18 09:06:26 +0000