| Index: media/base/media_win.cc
|
| diff --git a/media/base/media_win.cc b/media/base/media_win.cc
|
| index 616d3700631b81210e052b5fc34c39ae54e228c6..cc8008919c31c1d03901e386a368567413dcc9db 100644
|
| --- a/media/base/media_win.cc
|
| +++ b/media/base/media_win.cc
|
| @@ -28,7 +28,7 @@ static const char* kFFmpegDLL = "ffmpegsumo.dll";
|
| // guarantee this is only set once in a thread safe manner.
|
| static bool g_media_library_is_initialized = false;
|
|
|
| -static bool InitializeMediaLibraryInternal(const FilePath& base_path) {
|
| +static bool InitializeMediaLibraryInternal(const base::FilePath& base_path) {
|
| DCHECK(!g_media_library_is_initialized);
|
|
|
| // LoadLibraryEx(..., LOAD_WITH_ALTERED_SEARCH_PATH) cannot handle
|
| @@ -47,7 +47,7 @@ static bool InitializeMediaLibraryInternal(const FilePath& base_path) {
|
| 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);
|
| @@ -55,7 +55,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));
|
| }
|
|
|