| Index: webkit/plugins/npapi/plugin_list_mac.mm
|
| diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm
|
| index 66f32960540e18761fa11f60149a5ff89c46a0a8..922962a43e512813923720f013bfc10987dda527 100644
|
| --- a/webkit/plugins/npapi/plugin_list_mac.mm
|
| +++ b/webkit/plugins/npapi/plugin_list_mac.mm
|
| @@ -7,6 +7,7 @@
|
| #import <Foundation/Foundation.h>
|
|
|
| #include "base/file_util.h"
|
| +#include "base/files/file_enumerator.h"
|
| #include "base/mac/mac_util.h"
|
| #include "base/string_util.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -78,9 +79,9 @@ void PluginList::GetPluginDirectories(std::vector<base::FilePath>* plugin_dirs)
|
|
|
| void PluginList::GetPluginsInDir(
|
| const base::FilePath& path, std::vector<base::FilePath>* plugins) {
|
| - file_util::FileEnumerator enumerator(path,
|
| - false, // not recursive
|
| - file_util::FileEnumerator::DIRECTORIES);
|
| + base::FileEnumerator enumerator(path,
|
| + false, // not recursive
|
| + base::FileEnumerator::DIRECTORIES);
|
| for (base::FilePath path = enumerator.Next(); !path.value().empty();
|
| path = enumerator.Next()) {
|
| plugins->push_back(path);
|
|
|