Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1954)

Unified Diff: media/filters/blocking_url_protocol_unittest.cc

Issue 11360237: Use separate WaitableEvents in BlockingUrlProtocol for signalling abort versus read complete. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/blocking_url_protocol.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/blocking_url_protocol_unittest.cc
diff --git a/media/filters/blocking_url_protocol_unittest.cc b/media/filters/blocking_url_protocol_unittest.cc
index 8bd30c1806af853cfc3f2f10253b3a4ea4144af6..be335571cf86f34f554f3f9137da48df6f0ca3b3 100644
--- a/media/filters/blocking_url_protocol_unittest.cc
+++ b/media/filters/blocking_url_protocol_unittest.cc
@@ -7,6 +7,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/synchronization/waitable_event.h"
+#include "media/base/test_data_util.h"
#include "media/filters/blocking_url_protocol.h"
#include "media/filters/file_data_source.h"
#include "media/ffmpeg/ffmpeg_common.h"
@@ -18,15 +19,8 @@ namespace media {
class BlockingUrlProtocolTest : public testing::Test {
public:
BlockingUrlProtocolTest() {
- FilePath file_path;
- EXPECT_TRUE(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("bear-320x240.webm");
-
data_source_ = new FileDataSource();
- CHECK(data_source_->Initialize(file_path.MaybeAsASCII()));
+ CHECK(data_source_->Initialize(GetTestDataURL("bear-320x240.webm")));
url_protocol_.reset(new BlockingUrlProtocol(data_source_, base::Bind(
&BlockingUrlProtocolTest::OnDataSourceError, base::Unretained(this))));
« no previous file with comments | « media/filters/blocking_url_protocol.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698