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

Unified Diff: media/base/media_posix.cc

Issue 12217101: Replace FilePath with base::FilePath in some more top level directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/audio/win/audio_unified_win_unittest.cc ('k') | media/base/media_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_posix.cc
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc
index 724e11302b259dd8199b4777d9193e8ac710b103..34a5811db8d775c456967bda7cb79eebbb657178 100644
--- a/media/base/media_posix.cc
+++ b/media/base/media_posix.cc
@@ -37,11 +37,11 @@ namespace media {
#if defined(OS_MACOSX)
// TODO(evan): should be using .so like ffmepgsumo here.
#define DSO_NAME(MODULE, VERSION) ("lib" MODULE "." VERSION ".dylib")
-static const FilePath::CharType kSumoLib[] =
+static const base::FilePath::CharType kSumoLib[] =
FILE_PATH_LITERAL("ffmpegsumo.so");
#elif defined(OS_POSIX)
#define DSO_NAME(MODULE, VERSION) ("lib" MODULE ".so." VERSION)
-static const FilePath::CharType kSumoLib[] =
+static const base::FilePath::CharType kSumoLib[] =
FILE_PATH_LITERAL("libffmpegsumo.so");
#else
#error "Do not know how to construct DSO name for this OS."
@@ -52,7 +52,7 @@ static const FilePath::CharType kSumoLib[] =
// guarantee this is only set once in a thread safe manner.
static bool g_media_library_is_initialized = false;
-static bool InitializeMediaLibraryInternal(const FilePath& module_dir) {
+static bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
DCHECK(!g_media_library_is_initialized);
#if defined(USE_SYSTEM_FFMPEG)
@@ -79,7 +79,7 @@ static bool InitializeMediaLibraryInternal(const FilePath& module_dir) {
return g_media_library_is_initialized;
}
-bool InitializeMediaLibrary(const FilePath& base_path) {
+bool InitializeMediaLibrary(const base::FilePath& base_path) {
static const bool kMediaLibraryInitialized =
InitializeMediaLibraryInternal(base_path);
DCHECK_EQ(kMediaLibraryInitialized, g_media_library_is_initialized);
@@ -87,7 +87,7 @@ bool InitializeMediaLibrary(const FilePath& base_path) {
}
void InitializeMediaLibraryForTesting() {
- FilePath file_path;
+ base::FilePath file_path;
CHECK(PathService::Get(base::DIR_EXE, &file_path));
CHECK(InitializeMediaLibrary(file_path));
}
« no previous file with comments | « media/audio/win/audio_unified_win_unittest.cc ('k') | media/base/media_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698