Making browser test work (again) on Linux

base/path_service.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_PATH_SERVICE_H__
 #define BASE_PATH_SERVICE_H__
 
 #include "build/build_config.h"
 #ifdef OS_WIN
 // TODO(erikkay): this should be removable, but because SetCurrentDirectory
@@ skipping 30 matching lines @@
   // Overrides the path to a special directory or file.  This cannot be used to
   // change the value of DIR_CURRENT, but that should be obvious.  Also, if the
   // path specifies a directory that does not exist, the directory will be
   // created by this method.  This method returns true if successful.
   //
   // If the given path is relative, then it will be resolved against
   // DIR_CURRENT.
   //
   // WARNING: Consumers of PathService::Get may expect paths to be constant
   // over the lifetime of the app, so this method should be used with caution.
+  static bool Override(int key, const FilePath& path);
+  // This version, using a wstring, is deprecated and only kept around
+  // until we can fix all callers.
   static bool Override(int key, const std::wstring& path);
 
   // Return whether a path was overridden.
   static bool IsOverridden(int key);
 
   // Sets the current directory.
   static bool SetCurrentDirectory(const std::wstring& current_directory);
 
   // To extend the set of supported keys, you can register a path provider,
   // which is just a function mirroring PathService::Get.  The ProviderFunc
@@ skipping 10 matching lines @@
   static void RegisterProvider(ProviderFunc provider,
                                int key_start,
                                int key_end);
  private:
   static bool GetFromCache(int key, FilePath* path);
   static void AddToCache(int key, const FilePath& path);
 
 };
 
 #endif // BASE_PATH_SERVICE_H__