summaryrefslogtreecommitdiffstats
path: root/extensions/browser/api
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2016-02-23 15:21:44 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-23 23:22:38 +0000
commit7ba5a6213c612d3d12ecc7255bd560536f985039 (patch)
tree933a0cb5bee7031f97626f84d56a6749bb2079f9 /extensions/browser/api
parentc6d7f720fbfcbe3751db6e666ca33a03266c7b92 (diff)
downloadchromium_src-7ba5a6213c612d3d12ecc7255bd560536f985039.zip
chromium_src-7ba5a6213c612d3d12ecc7255bd560536f985039.tar.gz
chromium_src-7ba5a6213c612d3d12ecc7255bd560536f985039.tar.bz2
net: move IsLocalhost() function into url_util.h
This patch moves the last function in net_util.h into url_util.h. We are moving it there because it also operates on a URL part (host). BUG=488531 TEST=net_unittests --gtest_filter=UrlUtilTest.IsLocalhost R=eroman@chromium.org TBR=darin@chromium.org Review URL: https://codereview.chromium.org/1726693002 Cr-Commit-Position: refs/heads/master@{#377115}
Diffstat (limited to 'extensions/browser/api')
-rw-r--r--extensions/browser/api/cast_channel/cast_channel_api.cc1
-rw-r--r--extensions/browser/api/cast_channel/cast_socket.cc1
-rw-r--r--extensions/browser/api/cast_channel/cast_socket_unittest.cc1
-rw-r--r--extensions/browser/api/socket/socket_api.cc2
4 files changed, 1 insertions, 4 deletions
diff --git a/extensions/browser/api/cast_channel/cast_channel_api.cc b/extensions/browser/api/cast_channel/cast_channel_api.cc
index c0f8821..b5593f7 100644
--- a/extensions/browser/api/cast_channel/cast_channel_api.cc
+++ b/extensions/browser/api/cast_channel/cast_channel_api.cc
@@ -28,7 +28,6 @@
#include "extensions/common/api/cast_channel/logging.pb.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
-#include "net/base/net_util.h"
// Default timeout interval for connection setup.
// Used if not otherwise specified at ConnectInfo::timeout.
diff --git a/extensions/browser/api/cast_channel/cast_socket.cc b/extensions/browser/api/cast_channel/cast_socket.cc
index 6a330e3..12df2bf 100644
--- a/extensions/browser/api/cast_channel/cast_socket.cc
+++ b/extensions/browser/api/cast_channel/cast_socket.cc
@@ -28,7 +28,6 @@
#include "net/base/address_list.h"
#include "net/base/host_port_pair.h"
#include "net/base/net_errors.h"
-#include "net/base/net_util.h"
#include "net/cert/cert_verifier.h"
#include "net/cert/cert_verify_result.h"
#include "net/cert/x509_certificate.h"
diff --git a/extensions/browser/api/cast_channel/cast_socket_unittest.cc b/extensions/browser/api/cast_channel/cast_socket_unittest.cc
index f79ce16..dbc46dc 100644
--- a/extensions/browser/api/cast_channel/cast_socket_unittest.cc
+++ b/extensions/browser/api/cast_channel/cast_socket_unittest.cc
@@ -26,7 +26,6 @@
#include "extensions/common/api/cast_channel/cast_channel.pb.h"
#include "net/base/address_list.h"
#include "net/base/net_errors.h"
-#include "net/base/net_util.h"
#include "net/log/test_net_log.h"
#include "net/socket/socket_test_util.h"
#include "net/socket/ssl_client_socket.h"
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc
index 7653f56..88b2a83 100644
--- a/extensions/browser/api/socket/socket_api.cc
+++ b/extensions/browser/api/socket/socket_api.cc
@@ -25,8 +25,8 @@
#include "net/base/io_buffer.h"
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
-#include "net/base/net_util.h"
#include "net/base/network_interfaces.h"
+#include "net/base/url_util.h"
#include "net/log/net_log.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"