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

Unified Diff: media/filters/pipeline_integration_test_base.h

Issue 12163003: Add FilePath to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months 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/base/media_stub.cc ('k') | media/webm/chromeos/webm_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test_base.h
diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h
index dedbb70c57a9c5aedd0a0667da4b1811667627b3..19bdda0fa30b339da1f71560bf862655f07910db 100644
--- a/media/filters/pipeline_integration_test_base.h
+++ b/media/filters/pipeline_integration_test_base.h
@@ -14,7 +14,9 @@
#include "media/filters/video_renderer_base.h"
#include "testing/gmock/include/gmock/gmock.h"
+namespace base {
class FilePath;
+}
namespace media {
@@ -39,14 +41,14 @@ class PipelineIntegrationTestBase {
bool WaitUntilOnEnded();
PipelineStatus WaitUntilEndedOrError();
- bool Start(const FilePath& file_path, PipelineStatus expected_status);
+ bool Start(const base::FilePath& file_path, PipelineStatus expected_status);
// Enable playback with audio and video hashing enabled. Frame dropping and
// audio underflow will be disabled to ensure consistent hashes.
- bool Start(const FilePath& file_path, PipelineStatus expected_status,
+ bool Start(const base::FilePath& file_path, PipelineStatus expected_status,
bool hashing_enabled);
// Initialize the pipeline and ignore any status updates. Useful for testing
// invalid audio/video clips which don't have deterministic results.
- bool Start(const FilePath& file_path);
+ bool Start(const base::FilePath& file_path);
void Play();
void Pause();
@@ -54,7 +56,7 @@ class PipelineIntegrationTestBase {
void Stop();
bool WaitUntilCurrentTimeIsAfter(const base::TimeDelta& wait_time);
scoped_ptr<FilterCollection> CreateFilterCollection(
- const FilePath& file_path);
+ const base::FilePath& file_path);
// Returns the MD5 hash of all video frames seen. Should only be called once
// after playback completes. First time hashes should be generated with
« no previous file with comments | « media/base/media_stub.cc ('k') | media/webm/chromeos/webm_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698