Making browser test work (again) on Linux

base/path_service.cc

 // 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.
 
 #include "base/path_service.h"
 
 #ifdef OS_WIN
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 188 matching lines @@
 }
 
 bool PathService::IsOverridden(int key) {
   PathData* path_data = GetPathData();
   DCHECK(path_data);
 
   AutoLock scoped_lock(path_data->lock);
   return path_data->overrides.find(key) != path_data->overrides.end();
 }
 
-bool PathService::Override(int key, const std::wstring& path) {
+bool PathService::Override(int key, const FilePath& path) {
   PathData* path_data = GetPathData();
   DCHECK(path_data);
   DCHECK(key > base::DIR_CURRENT) << "invalid path key";
 
-  std::wstring file_path = path;
+  FilePath file_path = path;
 #if defined(OS_WIN)
   // On Windows we switch the current working directory to load plugins (at
   // least). That's not the case on POSIX.
   // Also, on POSIX, AbsolutePath fails if called on a non-existant path.
   if (!file_util::AbsolutePath(&file_path))
     return false;
 #endif
 
   // make sure the directory exists:
-  if (!file_util::CreateDirectory(file_path))
+  if (!file_util::PathExists(file_path) &&
+      !file_util::CreateDirectory(file_path))
     return false;
 
-  file_util::TrimTrailingSeparator(&file_path);
-
   AutoLock scoped_lock(path_data->lock);
-  path_data->cache[key] = FilePath::FromWStringHack(file_path);
+  path_data->cache[key] = file_path;
   path_data->overrides.insert(key);
   return true;
 }
 
+bool PathService::Override(int key, const std::wstring& path) {
+  return Override(key, FilePath::FromWStringHack(path));
+}
+
 bool PathService::SetCurrentDirectory(const std::wstring& current_directory) {
   return file_util::SetCurrentDirectory(current_directory);
 }
 
 void PathService::RegisterProvider(ProviderFunc func, int key_start,
                                    int key_end) {
   PathData* path_data = GetPathData();
   DCHECK(path_data);
   DCHECK(key_end > key_start);
 
@@ skipping 13 matching lines @@
   p = new Provider;
   p->is_static = false;
   p->func = func;
   p->next = path_data->providers;
 #ifndef NDEBUG
   p->key_start = key_start;
   p->key_end = key_end;
 #endif
   path_data->providers = p;
 }