diff options
author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 15:14:59 +0000 |
---|---|---|
committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 15:14:59 +0000 |
commit | 72f582938721f2ad69e3eb034d0562938ae1c4f7 (patch) | |
tree | 021a56faf0af0abab0546d9d4a7594500d97a8e7 /base/path_service.cc | |
parent | 1c47238c726247bb8718964941270905fa27b5be (diff) | |
download | chromium_src-72f582938721f2ad69e3eb034d0562938ae1c4f7.zip chromium_src-72f582938721f2ad69e3eb034d0562938ae1c4f7.tar.gz chromium_src-72f582938721f2ad69e3eb034d0562938ae1c4f7.tar.bz2 |
Revert 135321 - Make sure only the main browser process and service proceses are allowed to create the profile directory.
This patch lets Chrome start with profile located on a network share on
Windows Vista and newer.
BUG=120388
TEST=Start Chrome with --user-data-dir pointing to a network share location and try to navigate to a web page. This should not lead to a hang of the renderer.
Review URL: http://codereview.chromium.org/10306009
TBR=pastarmovj@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10382012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/path_service.cc')
-rw-r--r-- | base/path_service.cc | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/base/path_service.cc b/base/path_service.cc index a3b882c..46f394c 100644 --- a/base/path_service.cc +++ b/base/path_service.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -222,29 +222,18 @@ bool PathService::Get(int key, FilePath* result) { } bool PathService::Override(int key, const FilePath& path) { - // Just call the full function with true for the value of |create|. - return OverrideAndCreateIfNeeded(key, path, true); -} - -bool PathService::OverrideAndCreateIfNeeded(int key, - const FilePath& path, - bool create) { PathData* path_data = GetPathData(); DCHECK(path_data); DCHECK_GT(key, base::DIR_CURRENT) << "invalid path key"; FilePath file_path = path; - // For some locations this will fail if called from inside the sandbox there- - // fore we protect this call with a flag. - if (create) { - // Make sure the directory exists. We need to do this before we translate - // this to the absolute path because on POSIX, AbsolutePath fails if called - // on a non-existent path. - if (!file_util::PathExists(file_path) && - !file_util::CreateDirectory(file_path)) - return false; - } + // Make sure the directory exists. We need to do this before we translate + // this to the absolute path because on POSIX, AbsolutePath fails if called + // on a non-existent path. + if (!file_util::PathExists(file_path) && + !file_util::CreateDirectory(file_path)) + return false; // We need to have an absolute path, as extensions and plugins don't like // relative paths, and will gladly crash the browser in CHECK()s if they get a |