summaryrefslogtreecommitdiffstats
path: root/net/proxy
diff options
context:
space:
mode:
Diffstat (limited to 'net/proxy')
-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
3 files changed, 8 insertions, 7 deletions
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;