summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2016-02-11 18:48:40 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-12 02:49:48 +0000
commite5f66e6128834895ee2a31206542d586a5b75d97 (patch)
tree21f2432d8e4941c2a93e60b4a3f99bf1585c1491 /remoting/host
parentb6279320a3402f4d21b91b819b7c68f8699c70e2 (diff)
downloadchromium_src-e5f66e6128834895ee2a31206542d586a5b75d97.zip
chromium_src-e5f66e6128834895ee2a31206542d586a5b75d97.tar.gz
chromium_src-e5f66e6128834895ee2a31206542d586a5b75d97.tar.bz2
net: move GetHostName() function into network_interfaces.h
This patch moves it from net_util to network_interfaces because the hostname is a name for one of the machine's addresses. There could be multiple names based on the multiple addresses for the various interfaces, so this seems like a reasonable place. BUG=488531 TEST=net_unittests --gtest_filter=NetworkInterfacesTest.* R=eroman@chromium.org TBR=darin@chromium.org # for changes outside of net Review URL: https://codereview.chromium.org/1696533002 Cr-Commit-Position: refs/heads/master@{#375102}
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/setup/daemon_controller_delegate_linux.cc2
-rw-r--r--remoting/host/setup/me2me_native_messaging_host.cc2
-rw-r--r--remoting/host/setup/me2me_native_messaging_host_unittest.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/setup/daemon_controller_delegate_linux.cc b/remoting/host/setup/daemon_controller_delegate_linux.cc
index 2e40132..f8096ca 100644
--- a/remoting/host/setup/daemon_controller_delegate_linux.cc
+++ b/remoting/host/setup/daemon_controller_delegate_linux.cc
@@ -25,7 +25,7 @@
#include "base/thread_task_runner_handle.h"
#include "base/values.h"
#include "build/build_config.h"
-#include "net/base/net_util.h"
+#include "net/base/network_interfaces.h"
#include "remoting/host/host_config.h"
#include "remoting/host/usage_stats_consent.h"
diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc
index c807fef..39b31e5 100644
--- a/remoting/host/setup/me2me_native_messaging_host.cc
+++ b/remoting/host/setup/me2me_native_messaging_host.cc
@@ -22,7 +22,7 @@
#include "google_apis/gaia/gaia_oauth_client.h"
#include "google_apis/google_api_keys.h"
#include "ipc/ipc_channel.h"
-#include "net/base/net_util.h"
+#include "net/base/network_interfaces.h"
#include "remoting/base/rsa_key_pair.h"
#include "remoting/host/native_messaging/pipe_messaging_channel.h"
#include "remoting/host/pin_hash.h"
diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
index 4e0553a..e30a56a 100644
--- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc
+++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
@@ -20,7 +20,7 @@
#include "base/values.h"
#include "google_apis/gaia/gaia_oauth_client.h"
#include "net/base/file_stream.h"
-#include "net/base/net_util.h"
+#include "net/base/network_interfaces.h"
#include "remoting/base/auto_thread_task_runner.h"
#include "remoting/host/native_messaging/log_message_handler.h"
#include "remoting/host/native_messaging/pipe_messaging_channel.h"