diff options
| author | eroman <eroman@chromium.org> | 2015-04-02 10:23:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-02 17:24:10 +0000 |
| commit | 58e913aa2a031aab0d082d3380c49e1b5881eba4 (patch) | |
| tree | 10073cf6d01bba9ca2020e24c7da9c1b00c564d7 /device | |
| parent | 641f1a744de0734fc5299abbf72b726967f24d55 (diff) | |
| download | chromium_src-58e913aa2a031aab0d082d3380c49e1b5881eba4.zip chromium_src-58e913aa2a031aab0d082d3380c49e1b5881eba4.tar.gz chromium_src-58e913aa2a031aab0d082d3380c49e1b5881eba4.tar.bz2 | |
Update remaining code to include NetLog files from net/log directory rather than net/base.
(Some files in net/base got moved to net/log)
BUG=434856
TBR=armansito@chromium.org,jam@chromium.org
Review URL: https://codereview.chromium.org/1050923005
Cr-Commit-Position: refs/heads/master@{#323525}
Diffstat (limited to 'device')
| -rw-r--r-- | device/bluetooth/DEPS | 1 | ||||
| -rw-r--r-- | device/bluetooth/bluetooth_device.h | 2 | ||||
| -rw-r--r-- | device/bluetooth/bluetooth_socket_net.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/device/bluetooth/DEPS b/device/bluetooth/DEPS index bd16359..09f8af9 100644 --- a/device/bluetooth/DEPS +++ b/device/bluetooth/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+dbus", "+grit", "+net/base", + "+net/log", "+net/socket", "+ui/base/l10n", "+third_party/cros_system_api/dbus", diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h index 8d76adf..f1abf31 100644 --- a/device/bluetooth/bluetooth_device.h +++ b/device/bluetooth/bluetooth_device.h @@ -15,7 +15,7 @@ #include "base/strings/string16.h" #include "device/bluetooth/bluetooth_export.h" #include "device/bluetooth/bluetooth_uuid.h" -#include "net/base/net_log.h" +#include "net/log/net_log.h" namespace base { class BinaryValue; diff --git a/device/bluetooth/bluetooth_socket_net.cc b/device/bluetooth/bluetooth_socket_net.cc index eb3776c..b042863 100644 --- a/device/bluetooth/bluetooth_socket_net.cc +++ b/device/bluetooth/bluetooth_socket_net.cc @@ -18,7 +18,7 @@ #include "device/bluetooth/bluetooth_socket_thread.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/net_log.h" +#include "net/log/net_log.h" namespace { |