diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 20:10:01 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 20:10:01 +0000 |
| commit | bd14d7869e606315fb3112f5ec6f4288e9da7045 (patch) | |
| tree | 18b843806ecc990040ab85fcfc334f4fb48b60da /content/shell | |
| parent | 978a4a390908c591b11aeca6f0c79f2628f6bc48 (diff) | |
| download | chromium_src-bd14d7869e606315fb3112f5ec6f4288e9da7045.zip chromium_src-bd14d7869e606315fb3112f5ec6f4288e9da7045.tar.gz chromium_src-bd14d7869e606315fb3112f5ec6f4288e9da7045.tar.bz2 | |
ContentShell would break in release mode because of a call to retrieve a path
made in a DCHECK, and therefore compiled out in release mode.
Interestingly the content shell would be happy without that file, but given how
a previous CL changed the way we pass file descriptors to the created process,
it now caused problems.
BUG=None
TEST=Content shell should work in release mode.
Review URL: https://chromiumcodereview.appspot.com/10991070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_content_browser_client.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc index e07287a..261e876 100644 --- a/content/shell/shell_content_browser_client.cc +++ b/content/shell/shell_content_browser_client.cc @@ -79,7 +79,8 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess( std::vector<content::FileDescriptorInfo>* mappings) { int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ; FilePath pak_file; - DCHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_file)); + bool r = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_file); + CHECK(r); pak_file = pak_file.Append(FILE_PATH_LITERAL("paks")); pak_file = pak_file.Append(FILE_PATH_LITERAL("content_shell.pak")); |