| Index: chrome/common/chrome_paths.cc
 | 
| diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
 | 
| index aa9ae8d0013c5aee733d07d2b1f372dd1c70b89c..43827937935dd55659a6cf090871a72c4a378d37 100644
 | 
| --- a/chrome/common/chrome_paths.cc
 | 
| +++ b/chrome/common/chrome_paths.cc
 | 
| @@ -23,11 +23,10 @@ namespace chrome {
 | 
|  bool GetGearsPluginPathFromCommandLine(FilePath* path) {
 | 
|  #ifndef NDEBUG
 | 
|    // for debugging, support a cmd line based override
 | 
| -  std::wstring plugin_path = CommandLine::ForCurrentProcess()->GetSwitchValue(
 | 
| -      switches::kGearsPluginPathOverride);
 | 
| -  // TODO(tc): After GetSwitchNativeValue lands, we don't need to use
 | 
| -  // FromWStringHack.
 | 
| -  *path = FilePath::FromWStringHack(plugin_path);
 | 
| +  FilePath plugin_path =
 | 
| +      CommandLine::ForCurrentProcess()->GetSwitchValuePath(
 | 
| +          switches::kGearsPluginPathOverride);
 | 
| +  *path = plugin_path;
 | 
|    return !plugin_path.empty();
 | 
|  #else
 | 
|    return false;
 | 
| 
 |