| Index: base/native_library_win.cc
|
| diff --git a/base/native_library_win.cc b/base/native_library_win.cc
|
| index 2d437fa2a581fbad1b448c1f15607590d3c59008..3d2af6226292583891b9c4142e9a24a8d735bb15 100644
|
| --- a/base/native_library_win.cc
|
| +++ b/base/native_library_win.cc
|
| @@ -17,23 +17,23 @@ typedef HMODULE (WINAPI* LoadLibraryFunction)(const wchar_t* file_name);
|
| NativeLibrary LoadNativeLibraryHelper(const FilePath& library_path,
|
| LoadLibraryFunction load_library_api) {
|
| // LoadLibrary() opens the file off disk.
|
| - base::ThreadRestrictions::AssertIOAllowed();
|
| + ThreadRestrictions::AssertIOAllowed();
|
|
|
| // Switch the current directory to the library directory as the library
|
| // may have dependencies on DLLs in this directory.
|
| bool restore_directory = false;
|
| FilePath current_directory;
|
| - if (file_util::GetCurrentDirectory(¤t_directory)) {
|
| + if (GetCurrentDirectory(¤t_directory)) {
|
| FilePath plugin_path = library_path.DirName();
|
| if (!plugin_path.empty()) {
|
| - file_util::SetCurrentDirectory(plugin_path);
|
| + SetCurrentDirectory(plugin_path);
|
| restore_directory = true;
|
| }
|
| }
|
|
|
| HMODULE module = (*load_library_api)(library_path.value().c_str());
|
| if (restore_directory)
|
| - file_util::SetCurrentDirectory(current_directory);
|
| + SetCurrentDirectory(current_directory);
|
|
|
| return module;
|
| }
|
|
|