| Index: chrome/browser/plugin_service.cc
|
| diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
|
| index f9153c6bc1d0f711397fbd20c854739fc6068e31..5f66be93479fa64aa746a461e171d86189d6efb7 100644
|
| --- a/chrome/browser/plugin_service.cc
|
| +++ b/chrome/browser/plugin_service.cc
|
| @@ -54,10 +54,9 @@ PluginService::PluginService()
|
| ChromePluginLib::RegisterPluginsWithNPAPI();
|
| // Load the one specified on the command line as well.
|
| const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| - std::wstring path = command_line->GetSwitchValue(switches::kLoadPlugin);
|
| + FilePath path = command_line->GetSwitchValuePath(switches::kLoadPlugin);
|
| if (!path.empty()) {
|
| - NPAPI::PluginList::Singleton()->AddExtraPluginPath(
|
| - FilePath::FromWStringHack(path));
|
| + NPAPI::PluginList::Singleton()->AddExtraPluginPath(path);
|
| }
|
| #ifndef DISABLE_NACL
|
| if (command_line->HasSwitch(switches::kInternalNaCl))
|
|
|