Revert 116349 - Creating integration tests for media pipeline that use real decoders and demuxers.

Reverting so I can fix TSAN errors.


TEST=PipelineIntegrationTest


Review URL: http://codereview.chromium.org/8968035

TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/9094002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116375 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 12 deletions

diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index 3e6f3fd..45a3735 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -11,17 +11,6 @@
 
 namespace media {
 
-std::string GetTestDataURL(const std::string& name) {
-  FilePath file_path;
-  CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
-
-  file_path = file_path.Append(FILE_PATH_LITERAL("media"))
-      .Append(FILE_PATH_LITERAL("test"))
-      .Append(FILE_PATH_LITERAL("data"))
-      .AppendASCII(name);
-  return file_path.MaybeAsASCII();
-}
-
 void ReadTestDataFile(const std::string& name, scoped_array<uint8>* buffer,
                       int* size) {
   FilePath file_path;