summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 21:48:41 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 21:48:41 +0000
commit25fe7fc560ac4350eb57f070194e2755279f7fb4 (patch)
tree933dfc1d585da191c98634f1dddb883d0bbf62d1 /chrome/test/automation
parent7a7c9ed12b42a690ce294903de49d69ddd11b3c4 (diff)
downloadchromium_src-25fe7fc560ac4350eb57f070194e2755279f7fb4.zip
chromium_src-25fe7fc560ac4350eb57f070194e2755279f7fb4.tar.gz
chromium_src-25fe7fc560ac4350eb57f070194e2755279f7fb4.tar.bz2
Get rid of content dependency from sandbox_policy.h
BUG=76697 Review URL: http://codereview.chromium.org/7074025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/proxy_launcher.cc3
-rw-r--r--chrome/test/automation/proxy_launcher.h10
2 files changed, 0 insertions, 13 deletions
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index 6260b94..385d8f4 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -102,7 +102,6 @@ const char ProxyLauncher::kDefaultInterfacePath[] =
bool ProxyLauncher::in_process_renderer_ = false;
bool ProxyLauncher::no_sandbox_ = false;
bool ProxyLauncher::full_memory_dump_ = false;
-bool ProxyLauncher::safe_plugins_ = false;
bool ProxyLauncher::show_error_dialogs_ = true;
bool ProxyLauncher::dump_histograms_on_exit_ = false;
bool ProxyLauncher::enable_dcheck_ = false;
@@ -426,8 +425,6 @@ void ProxyLauncher::PrepareTestCommandline(CommandLine* command_line,
command_line->AppendSwitch(switches::kNoSandbox);
if (full_memory_dump_)
command_line->AppendSwitch(switches::kFullMemoryCrashReport);
- if (safe_plugins_)
- command_line->AppendSwitch(switches::kSafePlugins);
if (enable_dcheck_)
command_line->AppendSwitch(switches::kEnableDCHECK);
if (silent_dump_on_dcheck_)
diff --git a/chrome/test/automation/proxy_launcher.h b/chrome/test/automation/proxy_launcher.h
index 89b0d94..edd3ad4 100644
--- a/chrome/test/automation/proxy_launcher.h
+++ b/chrome/test/automation/proxy_launcher.h
@@ -176,13 +176,6 @@ class ProxyLauncher {
disable_breakpad_ = value;
}
- // Get/Set a flag to run the plugin processes inside the sandbox when running
- // the tests
- static bool safe_plugins() { return safe_plugins_; }
- static void set_safe_plugins(bool value) {
- safe_plugins_ = value;
- }
-
static bool show_error_dialogs() { return show_error_dialogs_; }
static void set_show_error_dialogs(bool value) {
show_error_dialogs_ = value;
@@ -263,9 +256,6 @@ class ProxyLauncher {
// If true, runs the renderer outside the sandbox.
static bool no_sandbox_;
- // If true, runs plugin processes inside the sandbox.
- static bool safe_plugins_;
-
// If true, write full memory dump during crash.
static bool full_memory_dump_;