1 files changed, 0 insertions, 201 deletions
diff --git a/chromium/media/mp4/box_reader_unittest.cc b/chromium/media/mp4/box_reader_unittest.cc
deleted file mode 100644
index 99d9975fd2d..00000000000
--- a/chromium/media/mp4/box_reader_unittest.cc
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright (c) 2012 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 <string.h>
-
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "media/mp4/box_reader.h"
-#include "media/mp4/rcheck.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace media {
-namespace mp4 {
-
-static const uint8 kSkipBox[] = {
-  // Top-level test box containing three children
-  0x00, 0x00, 0x00, 0x40, 's', 'k', 'i', 'p',
-  0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-  0xf9, 0x0a, 0x0b, 0x0c, 0xfd, 0x0e, 0x0f, 0x10,
-  // Ordinary (8-byte header) child box
-  0x00, 0x00, 0x00, 0x0c,  'p',  's',  's',  'h', 0xde, 0xad, 0xbe, 0xef,
-  // Extended-size header child box
-  0x00, 0x00, 0x00, 0x01,  'p',  's',  's',  'h',
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,
-  0xfa, 0xce, 0xca, 0xfe,
-  // Empty free box
-  0x00, 0x00, 0x00, 0x08,  'f',  'r',  'e',  'e',
-  // Trailing garbage
-  0x00 };
-
-struct FreeBox : Box {
-  virtual bool Parse(BoxReader* reader) OVERRIDE {
-    return true;
-  }
-  virtual FourCC BoxType() const OVERRIDE { return FOURCC_FREE; }
-};
-
-struct PsshBox : Box {
-  uint32 val;
-
-  virtual bool Parse(BoxReader* reader) OVERRIDE {
-    return reader->Read4(&val);
-  }
-  virtual FourCC BoxType() const OVERRIDE { return FOURCC_PSSH; }
-};
-
-struct SkipBox : Box {
-  uint8 a, b;
-  uint16 c;
-  int32 d;
-  int64 e;
-
-  std::vector<PsshBox> kids;
-  FreeBox mpty;
-
-  virtual bool Parse(BoxReader* reader) OVERRIDE {
-    RCHECK(reader->ReadFullBoxHeader() &&
-           reader->Read1(&a) &&
-           reader->Read1(&b) &&
-           reader->Read2(&c) &&
-           reader->Read4s(&d) &&
-           reader->Read4sInto8s(&e));
-    return reader->ScanChildren() &&
-           reader->ReadChildren(&kids) &&
-           reader->MaybeReadChild(&mpty);
-  }
-  virtual FourCC BoxType() const OVERRIDE { return FOURCC_SKIP; }
-
-  SkipBox();
-  virtual ~SkipBox();
-};
-
-SkipBox::SkipBox() {}
-SkipBox::~SkipBox() {}
-
-class BoxReaderTest : public testing::Test {
- protected:
-  std::vector<uint8> GetBuf() {
-    return std::vector<uint8>(kSkipBox, kSkipBox + sizeof(kSkipBox));
-  }
-};
-
-TEST_F(BoxReaderTest, ExpectedOperationTest) {
-  std::vector<uint8> buf = GetBuf();
-  bool err;
-  scoped_ptr<BoxReader> reader(
-      BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
-  EXPECT_FALSE(err);
-  EXPECT_TRUE(reader.get());
-
-  SkipBox box;
-  EXPECT_TRUE(box.Parse(reader.get()));
-  EXPECT_EQ(0x01, reader->version());
-  EXPECT_EQ(0x020304u, reader->flags());
-  EXPECT_EQ(0x05, box.a);
-  EXPECT_EQ(0x06, box.b);
-  EXPECT_EQ(0x0708, box.c);
-  EXPECT_EQ(static_cast<int32>(0xf90a0b0c), box.d);
-  EXPECT_EQ(static_cast<int32>(0xfd0e0f10), box.e);
-
-  EXPECT_EQ(2u, box.kids.size());
-  EXPECT_EQ(0xdeadbeef, box.kids[0].val);
-  EXPECT_EQ(0xfacecafe, box.kids[1].val);
-
-  // Accounting for the extra byte outside of the box above
-  EXPECT_EQ(buf.size(), static_cast<uint64>(reader->size() + 1));
-}
-
-TEST_F(BoxReaderTest, OuterTooShortTest) {
-  std::vector<uint8> buf = GetBuf();
-  bool err;
-
-  // Create a soft failure by truncating the outer box.
-  scoped_ptr<BoxReader> r(
-      BoxReader::ReadTopLevelBox(&buf[0], buf.size() - 2, LogCB(), &err));
-
-  EXPECT_FALSE(err);
-  EXPECT_FALSE(r.get());
-}
-
-TEST_F(BoxReaderTest, InnerTooLongTest) {
-  std::vector<uint8> buf = GetBuf();
-  bool err;
-
-  // Make an inner box too big for its outer box.
-  buf[25] = 1;
-  scoped_ptr<BoxReader> reader(
-      BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
-
-  SkipBox box;
-  EXPECT_FALSE(box.Parse(reader.get()));
-}
-
-TEST_F(BoxReaderTest, WrongFourCCTest) {
-  std::vector<uint8> buf = GetBuf();
-  bool err;
-
-  // Set an unrecognized top-level FourCC.
-  buf[5] = 1;
-  scoped_ptr<BoxReader> reader(
-      BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
-  EXPECT_FALSE(reader.get());
-  EXPECT_TRUE(err);
-}
-
-TEST_F(BoxReaderTest, ScanChildrenTest) {
-  std::vector<uint8> buf = GetBuf();
-  bool err;
-  scoped_ptr<BoxReader> reader(
-      BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
-
-  EXPECT_TRUE(reader->SkipBytes(16) && reader->ScanChildren());
-
-  FreeBox free;
-  EXPECT_TRUE(reader->ReadChild(&free));
-  EXPECT_FALSE(reader->ReadChild(&free));
-  EXPECT_TRUE(reader->MaybeReadChild(&free));
-
-  std::vector<PsshBox> kids;
-
-  EXPECT_TRUE(reader->ReadChildren(&kids));
-  EXPECT_EQ(2u, kids.size());
-  kids.clear();
-  EXPECT_FALSE(reader->ReadChildren(&kids));
-  EXPECT_TRUE(reader->MaybeReadChildren(&kids));
-}
-
-TEST_F(BoxReaderTest, ReadAllChildrenTest) {
-  std::vector<uint8> buf = GetBuf();
-  // Modify buffer to exclude its last 'free' box
-  buf[3] = 0x38;
-  bool err;
-  scoped_ptr<BoxReader> reader(
-      BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
-
-  std::vector<PsshBox> kids;
-  EXPECT_TRUE(reader->SkipBytes(16) && reader->ReadAllChildren(&kids));
-  EXPECT_EQ(2u, kids.size());
-  EXPECT_EQ(kids[0].val, 0xdeadbeef);   // Ensure order is preserved
-}
-
-TEST_F(BoxReaderTest, SkippingBloc) {
-  static const uint8 kData[] = {
-    0x00, 0x00, 0x00, 0x09,  'b',  'l',  'o',  'c', 0x00
-  };
-
-  std::vector<uint8> buf(kData, kData + sizeof(kData));
-
-  bool err;
-  scoped_ptr<BoxReader> reader(
-      BoxReader::ReadTopLevelBox(&buf[0], buf.size(), LogCB(), &err));
-
-  EXPECT_FALSE(err);
-  EXPECT_TRUE(reader);
-  EXPECT_EQ(FOURCC_BLOC, reader->type());
-}
-
-}  // namespace mp4
-}  // namespace media