Revert of Decouple Media Service

content/common/gpu/media/media_messages.cc

Index: content/common/gpu/media/media_messages.cc
diff --git a/content/common/gpu/media/media_messages.cc b/content/common/gpu/media/media_messages.cc
deleted file mode 100644
index 88364d9465eeb6029d1d6ee58151f4ed8a190fca..0000000000000000000000000000000000000000
--- a/content/common/gpu/media/media_messages.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <stddef.h>
-
-#include <sstream>
-
-#include "base/logging.h"
-#include "base/numerics/safe_math.h"
-#include "content/common/gpu/media/media_messages.h"
-
-namespace IPC {
-
-void ParamTraits<media::BitstreamBuffer>::Write(base::Pickle* m,
-                                                const param_type& p) {
-  WriteParam(m, p.id());
-  WriteParam(m, static_cast<uint64_t>(p.size()));
-  WriteParam(m, p.presentation_timestamp());
-  WriteParam(m, p.key_id());
-  if (!p.key_id().empty()) {
-    WriteParam(m, p.iv());
-    WriteParam(m, p.subsamples());
-  }
-  WriteParam(m, p.handle());
-}
-
-bool ParamTraits<media::BitstreamBuffer>::Read(const base::Pickle* m,
-                                               base::PickleIterator* iter,
-                                               param_type* r) {
-  DCHECK(r);
-  uint64_t size = 0;
-  if (!(ReadParam(m, iter, &r->id_) && ReadParam(m, iter, &size) &&
-        ReadParam(m, iter, &r->presentation_timestamp_) &&
-        ReadParam(m, iter, &r->key_id_)))
-    return false;
-
-  base::CheckedNumeric<size_t> checked_size(size);
-  if (!checked_size.IsValid()) {
-    DLOG(ERROR) << "Invalid size: " << size;
-    return false;
-  }
-  r->size_ = checked_size.ValueOrDie();
-
-  if (!r->key_id_.empty()) {
-    if (!(ReadParam(m, iter, &r->iv_) && ReadParam(m, iter, &r->subsamples_)))
-      return false;
-  }
-
-  return ReadParam(m, iter, &r->handle_);
-}
-
-void ParamTraits<media::BitstreamBuffer>::Log(const param_type& p,
-                                              std::string* l) {
-  std::ostringstream oss;
-  oss << "id=" << p.id() << ", size=" << p.size() << ", presentation_timestamp="
-      << p.presentation_timestamp().ToInternalValue();
-  l->append(oss.str());
-}
-
-}  // namespace IPC