summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authoreroman <eroman@chromium.org>2015-04-02 10:23:31 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-02 17:24:10 +0000
commit58e913aa2a031aab0d082d3380c49e1b5881eba4 (patch)
tree10073cf6d01bba9ca2020e24c7da9c1b00c564d7 /google_apis
parent641f1a744de0734fc5299abbf72b726967f24d55 (diff)
downloadchromium_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 'google_apis')
-rw-r--r--google_apis/gcm/tools/mcs_probe.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc
index e4be29ad..90225d4 100644
--- a/google_apis/gcm/tools/mcs_probe.cc
+++ b/google_apis/gcm/tools/mcs_probe.cc
@@ -34,13 +34,13 @@
#include "google_apis/gcm/engine/mcs_client.h"
#include "google_apis/gcm/monitoring/fake_gcm_stats_recorder.h"
#include "net/base/host_mapping_rules.h"
-#include "net/base/net_log_logger.h"
#include "net/cert/cert_verifier.h"
#include "net/dns/host_resolver.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_network_session.h"
#include "net/http/http_server_properties_impl.h"
#include "net/http/transport_security_state.h"
+#include "net/log/net_log_logger.h"
#include "net/socket/client_socket_factory.h"
#include "net/socket/ssl_client_socket.h"
#include "net/ssl/channel_id_service.h"