summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 15:33:28 +0000
committerskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 15:33:28 +0000
commitbd781d897ea507f9abc028462d04224ca273875a (patch)
treebf14c6237ec30d3e1815e3978807d1943ad22f9f /chrome/browser
parent5021691cce9e56fe0bb778df3ad92e41c55c6ed0 (diff)
downloadchromium_src-bd781d897ea507f9abc028462d04224ca273875a.zip
chromium_src-bd781d897ea507f9abc028462d04224ca273875a.tar.gz
chromium_src-bd781d897ea507f9abc028462d04224ca273875a.tar.bz2
Remove some debug switches:
--issue35198-crxdir-browser --issue35198-permission They were used to understand issue 35198. They are no longer needed. There is one more switch, --issue35198-logging, that is not being removed in this CL. The logging it adds may still be useful. BUG=50604 TEST=manual Review URL: http://codereview.chromium.org/3052023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/convert_user_script.cc2
-rw-r--r--chrome/browser/extensions/sandboxed_extension_unpacker.cc21
2 files changed, 2 insertions, 21 deletions
diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc
index b06553a..d50bec1 100644
--- a/chrome/browser/extensions/convert_user_script.cc
+++ b/chrome/browser/extensions/convert_user_script.cc
@@ -45,7 +45,7 @@ Extension* ConvertUserScriptToExtension(const FilePath& user_script_path,
CHECK(PathService::Get(chrome::DIR_USER_DATA_TEMP, &user_data_temp_dir));
ScopedTempDir temp_dir;
- if (!temp_dir.CreateUniqueTempDirUnderPath(user_data_temp_dir, false)) {
+ if (!temp_dir.CreateUniqueTempDirUnderPath(user_data_temp_dir)) {
*error = "Could not create temporary directory.";
return NULL;
}
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
index c087649..2de1c09 100644
--- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc
+++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc
@@ -42,18 +42,8 @@ void SandboxedExtensionUnpacker::Start() {
// file IO on.
CHECK(ChromeThread::GetCurrentThreadIdentifier(&thread_identifier_));
- // To understand crbug/35198, allow users who can reproduce the bug
- // to loosen permissions on the scoped directory.
- bool loosen_permissions = false;
-#if defined (OS_WIN)
- loosen_permissions = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kIssue35198Permission);
- LOG(INFO) << "loosen_permissions = " << loosen_permissions;
-#endif
-
// Create a temporary directory to work in.
- if (!temp_dir_.CreateUniqueTempDirUnderPath(temp_path_,
- loosen_permissions)) {
+ if (!temp_dir_.CreateUniqueTempDirUnderPath(temp_path_)) {
ReportFailure("Could not create temporary directory.");
return;
}
@@ -62,15 +52,6 @@ void SandboxedExtensionUnpacker::Start() {
extension_root_ = temp_dir_.path().AppendASCII(
extension_filenames::kTempExtensionName);
- // To understand crbug/35198, allow users who can reproduce the bug to
- // create the unpack directory in the browser process.
- bool crxdir_in_browser = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kIssue35198CrxDirBrowser);
- LOG(INFO) << "crxdir_in_browser = " << crxdir_in_browser;
- if (crxdir_in_browser && !file_util::CreateDirectory(extension_root_)) {
- LOG(ERROR) << "Failed to create directory " << extension_root_.value();
- }
-
// Extract the public key and validate the package.
if (!ValidateSignature())
return; // ValidateSignature() already reported the error.