summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 15:21:24 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 15:21:24 +0000
commit5d7eb86c365a47a9c3527784cb3831530fd9f191 (patch)
treeb0f6b10b4d6436964a92c9da74d54019fec3e08c /remoting/protocol
parent66e96c418e3f2476422c538d65b449cd8155d266 (diff)
downloadchromium_src-5d7eb86c365a47a9c3527784cb3831530fd9f191.zip
chromium_src-5d7eb86c365a47a9c3527784cb3831530fd9f191.tar.gz
chromium_src-5d7eb86c365a47a9c3527784cb3831530fd9f191.tar.bz2
Use a direct include of time headers in ppapi/, printing/, remoting/.
BUG=254986 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/18052008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/authenticator_test_base.cc2
-rw-r--r--remoting/protocol/client_event_dispatcher.cc2
-rw-r--r--remoting/protocol/jingle_session.cc2
-rw-r--r--remoting/protocol/jingle_session.h2
-rw-r--r--remoting/protocol/jingle_session_unittest.cc4
-rw-r--r--remoting/protocol/libjingle_transport_factory.cc2
-rw-r--r--remoting/protocol/pairing_registry.h2
-rw-r--r--remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc2
8 files changed, 9 insertions, 9 deletions
diff --git a/remoting/protocol/authenticator_test_base.cc b/remoting/protocol/authenticator_test_base.cc
index 321f8bb0..22b1047 100644
--- a/remoting/protocol/authenticator_test_base.cc
+++ b/remoting/protocol/authenticator_test_base.cc
@@ -9,7 +9,7 @@
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "base/test/test_timeouts.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "net/base/test_data_directory.h"
#include "remoting/base/rsa_key_pair.h"
#include "remoting/protocol/authenticator.h"
diff --git a/remoting/protocol/client_event_dispatcher.cc b/remoting/protocol/client_event_dispatcher.cc
index e66181f5e2..e940f93 100644
--- a/remoting/protocol/client_event_dispatcher.cc
+++ b/remoting/protocol/client_event_dispatcher.cc
@@ -5,7 +5,7 @@
#include "remoting/protocol/client_event_dispatcher.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/constants.h"
#include "remoting/proto/event.pb.h"
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index ac67d4e..7b868c7 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -8,7 +8,7 @@
#include "base/rand_util.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "remoting/base/constants.h"
#include "remoting/jingle_glue/iq_sender.h"
#include "remoting/protocol/authenticator.h"
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index 1701882..5466d1d 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -11,7 +11,7 @@
#include <string>
#include "base/memory/ref_counted.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "crypto/rsa_private_key.h"
#include "net/base/completion_callback.h"
#include "remoting/jingle_glue/iq_sender.h"
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 91b78c6..bbc988e 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -6,18 +6,18 @@
#include "base/bind.h"
#include "base/message_loop.h"
-#include "base/time.h"
#include "base/test/test_timeouts.h"
+#include "base/time/time.h"
#include "net/socket/socket.h"
#include "net/socket/stream_socket.h"
#include "remoting/base/constants.h"
+#include "remoting/jingle_glue/fake_signal_strategy.h"
#include "remoting/protocol/authenticator.h"
#include "remoting/protocol/channel_authenticator.h"
#include "remoting/protocol/connection_tester.h"
#include "remoting/protocol/fake_authenticator.h"
#include "remoting/protocol/jingle_session_manager.h"
#include "remoting/protocol/libjingle_transport_factory.h"
-#include "remoting/jingle_glue/fake_signal_strategy.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 138b0ed..996a701 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -6,7 +6,7 @@
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "jingle/glue/channel_socket_adapter.h"
#include "jingle/glue/pseudotcp_adapter.h"
#include "jingle/glue/thread_wrapper.h"
diff --git a/remoting/protocol/pairing_registry.h b/remoting/protocol/pairing_registry.h
index 0938d4e..91998d5 100644
--- a/remoting/protocol/pairing_registry.h
+++ b/remoting/protocol/pairing_registry.h
@@ -12,7 +12,7 @@
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/threading/non_thread_safe.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace remoting {
namespace protocol {
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
index 351f1a1..db2b752 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
+++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
@@ -11,7 +11,7 @@
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/test/test_timeouts.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "crypto/rsa_private_key.h"
#include "net/base/net_errors.h"
#include "net/base/test_data_directory.h"