Restore original namespaces for mkvmuxer and mkvparser.

Wrapping mkvmuxer and mkvparser in the libwebm namespace is no
longer necessary now that the tree reorganization is complete.
Put mkvmuxer and mkvparser namespaces back in the global
namespace to avoid unnecessary churn in downstream code.

Change-Id: I13a4fe0143d20bb2bb6038078c68636ff2af0c29

testing/muxer_tests.cc

@@ -30,16 +30,15 @@
 #pragma warning(disable : 4996)
 #endif
 
-using libwebm::mkvmuxer::AudioTrack;
-using libwebm::mkvmuxer::Chapter;
-using libwebm::mkvmuxer::Frame;
-using libwebm::mkvmuxer::MkvWriter;
-using libwebm::mkvmuxer::Segment;
-using libwebm::mkvmuxer::SegmentInfo;
-using libwebm::mkvmuxer::Track;
-using libwebm::mkvmuxer::VideoTrack;
+using mkvmuxer::AudioTrack;
+using mkvmuxer::Chapter;
+using mkvmuxer::Frame;
+using mkvmuxer::MkvWriter;
+using mkvmuxer::Segment;
+using mkvmuxer::SegmentInfo;
+using mkvmuxer::Track;
+using mkvmuxer::VideoTrack;
 
-namespace libwebm {
 namespace test {
 
 // Base class containing boiler plate stuff.
@@ -54,9 +53,10 @@ class MuxerTest : public testing::Test {
   // are fatal, but the ASSERT_* gtest macros cannot be used in a constructor.
   void Init() {
     ASSERT_TRUE(GetTestDataDir().length() > 0);
-    filename_ = GetTempFileName();
+    filename_ = libwebm::GetTempFileName();
     ASSERT_GT(filename_.length(), 0u);
-    temp_file_ = FilePtr(std::fopen(filename_.c_str(), "wb"), FILEDeleter());
+    temp_file_ = libwebm::FilePtr(std::fopen(filename_.c_str(), "wb"),
+                                  libwebm::FILEDeleter());
     ASSERT_TRUE(temp_file_.get() != nullptr);
     writer_.reset(new MkvWriter(temp_file_.get()));
     is_writer_open_ = true;
@@ -112,7 +112,7 @@ class MuxerTest : public testing::Test {
   bool is_writer_open_ = false;
   Segment segment_;
   std::string filename_;
-  FilePtr temp_file_;
+  libwebm::FilePtr temp_file_;
   std::uint8_t dummy_data_[kFrameLength];
 };
 
@@ -473,7 +473,7 @@ TEST_F(MuxerTest, CuesBeforeClusters) {
   mkvparser::MkvReader reader;
   ASSERT_EQ(0, reader.Open(filename_.c_str()));
   MkvWriter cues_writer;
-  std::string cues_filename = GetTempFileName();
+  std::string cues_filename = libwebm::GetTempFileName();
   ASSERT_GT(cues_filename.length(), 0u);
   cues_writer.Open(cues_filename.c_str());
   EXPECT_TRUE(segment_.CopyAndMoveCuesBeforeClusters(&reader, &cues_writer));
@@ -704,7 +704,6 @@ TEST_F(MuxerTest, AccurateClusterDurationTwoTracks) {
 }
 
 }  // namespace test
-}  // namespace libwebm
 
 int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);

testing/parser_tests.cc

@@ -18,21 +18,20 @@
 #include "mkvparser/mkvreader.h"
 #include "testing/test_util.h"
 
-using libwebm::mkvparser::AudioTrack;
-using libwebm::mkvparser::Block;
-using libwebm::mkvparser::BlockEntry;
-using libwebm::mkvparser::BlockGroup;
-using libwebm::mkvparser::Cluster;
-using libwebm::mkvparser::CuePoint;
-using libwebm::mkvparser::Cues;
-using libwebm::mkvparser::MkvReader;
-using libwebm::mkvparser::Segment;
-using libwebm::mkvparser::SegmentInfo;
-using libwebm::mkvparser::Track;
-using libwebm::mkvparser::Tracks;
-using libwebm::mkvparser::VideoTrack;
+using mkvparser::AudioTrack;
+using mkvparser::Block;
+using mkvparser::BlockEntry;
+using mkvparser::BlockGroup;
+using mkvparser::Cluster;
+using mkvparser::CuePoint;
+using mkvparser::Cues;
+using mkvparser::MkvReader;
+using mkvparser::Segment;
+using mkvparser::SegmentInfo;
+using mkvparser::Track;
+using mkvparser::Tracks;
+using mkvparser::VideoTrack;
 
-namespace libwebm {
 namespace test {
 
 // Base class containing boiler plate stuff.
@@ -664,7 +663,6 @@ TEST_F(ParserTest, StereoModeParsedCorrectly) {
 }
 
 }  // namespace test
-}  // namespace libwebm
 
 int main(int argc, char* argv[]) {
   ::testing::InitGoogleTest(&argc, argv);

testing/test_util.cc

@@ -21,7 +21,6 @@
 
 #include "common/libwebm_util.h"
 
-namespace libwebm {
 namespace test {
 
 std::string GetTestDataDir() {
@@ -39,8 +38,10 @@ bool CompareFiles(const std::string& file1, const std::string& file2) {
   std::uint8_t buf1[kBlockSize] = {0};
   std::uint8_t buf2[kBlockSize] = {0};
 
-  FilePtr f1 = FilePtr(std::fopen(file1.c_str(), "rb"), FILEDeleter());
-  FilePtr f2 = FilePtr(std::fopen(file2.c_str(), "rb"), FILEDeleter());
+  libwebm::FilePtr f1 =
+      libwebm::FilePtr(std::fopen(file1.c_str(), "rb"), libwebm::FILEDeleter());
+  libwebm::FilePtr f2 =
+      libwebm::FilePtr(std::fopen(file2.c_str(), "rb"), libwebm::FILEDeleter());
 
   if (!f1.get() || !f2.get()) {
     // Files cannot match if one or both couldn't be opened.
@@ -59,5 +60,4 @@ bool CompareFiles(const std::string& file1, const std::string& file2) {
   return std::feof(f1.get()) && std::feof(f2.get());
 }
 
-}  // namespace test
-}  // namespace libwebm
+}  // namespace test

testing/test_util.h

@@ -13,7 +13,6 @@
 #include <cstddef>
 #include <string>
 
-namespace libwebm {
 namespace test {
 
 // constants for muxer and parser tests
@@ -54,6 +53,5 @@ std::string GetTestFilePath(const std::string& name);
 bool CompareFiles(const std::string& file1, const std::string& file2);
 
 }  // namespace test
-}  // namespace libwebm
 
 #endif  // LIBWEBM_TESTING_TEST_UTIL_H_