summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorcharliea <charliea@chromium.org>2015-11-05 05:48:56 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-05 13:49:48 +0000
commit2bccc2cf38624593e1adafefccec7314aa573b0f (patch)
tree9d59cac140bc520a3099966457c5cf481e9a1741 /ipc
parent1f548985bfeaacd0aa4b782c629d1ecbc29173c7 (diff)
downloadchromium_src-2bccc2cf38624593e1adafefccec7314aa573b0f.zip
chromium_src-2bccc2cf38624593e1adafefccec7314aa573b0f.tar.gz
chromium_src-2bccc2cf38624593e1adafefccec7314aa573b0f.tar.bz2
Kills TraceTicks, which was functionally the same as TimeTicks
This was not true until last week's submission of http://crrev.com/1374753004. BUG=541692 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel NO_PRESUBMIT=true Review URL: https://codereview.chromium.org/1424703003 Cr-Commit-Position: refs/heads/master@{#358047}
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_message_utils.cc19
-rw-r--r--ipc/ipc_message_utils.h11
2 files changed, 0 insertions, 30 deletions
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index 26edc12..8377712 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -865,25 +865,6 @@ void ParamTraits<base::TimeTicks>::Log(const param_type& p, std::string* l) {
ParamTraits<int64_t>::Log(p.ToInternalValue(), l);
}
-void ParamTraits<base::TraceTicks>::Write(Message* m, const param_type& p) {
- ParamTraits<int64_t>::Write(m, p.ToInternalValue());
-}
-
-bool ParamTraits<base::TraceTicks>::Read(const Message* m,
- base::PickleIterator* iter,
- param_type* r) {
- int64_t value;
- bool ret = ParamTraits<int64_t>::Read(m, iter, &value);
- if (ret)
- *r = base::TraceTicks::FromInternalValue(value);
-
- return ret;
-}
-
-void ParamTraits<base::TraceTicks>::Log(const param_type& p, std::string* l) {
- ParamTraits<int64_t>::Log(p.ToInternalValue(), l);
-}
-
void ParamTraits<IPC::ChannelHandle>::Write(Message* m, const param_type& p) {
#if defined(OS_WIN)
// On Windows marshalling pipe handle is not supported.
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 1e2832f..817d752 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -59,7 +59,6 @@ class NullableString16;
class Time;
class TimeDelta;
class TimeTicks;
-class TraceTicks;
struct FileDescriptor;
#if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN)
@@ -585,16 +584,6 @@ struct IPC_EXPORT ParamTraits<base::TimeTicks> {
};
template <>
-struct IPC_EXPORT ParamTraits<base::TraceTicks> {
- typedef base::TraceTicks param_type;
- static void Write(Message* m, const param_type& p);
- static bool Read(const Message* m,
- base::PickleIterator* iter,
- param_type* r);
- static void Log(const param_type& p, std::string* l);
-};
-
-template <>
struct ParamTraits<base::Tuple<>> {
typedef base::Tuple<> param_type;
static void Write(Message* m, const param_type& p) {