Commit f353f6b6 authored by jeremy@chromium.org's avatar jeremy@chromium.org

Remove --reduce-security-for-stats-collection-tests switch

This change is per jam@'s review comment on https://codereview.chromium.org/12389073/ . The switch is redundant with --enable-stats-collection-bindings .

BUG=None
TBR=tonyg

Review URL: https://chromiumcodereview.appspot.com/15804006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203122 0039d316-1c4b-4281-b951-d872f2087c98
parent a888038f
...@@ -52,15 +52,9 @@ void HistogramMessageFilter::OnGetBrowserHistogram( ...@@ -52,15 +52,9 @@ void HistogramMessageFilter::OnGetBrowserHistogram(
bool using_stats_collection_controller = bool using_stats_collection_controller =
CommandLine::ForCurrentProcess()->HasSwitch( CommandLine::ForCurrentProcess()->HasSwitch(
switches::kStatsCollectionController); switches::kStatsCollectionController);
bool reduced_security = if (!using_stats_collection_controller) {
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kReduceSecurityForStatsCollectionTests);
if (!using_stats_collection_controller || !reduced_security) {
LOG(ERROR) << "Attempt at reading browser histogram without specifying " LOG(ERROR) << "Attempt at reading browser histogram without specifying "
<< "--" << switches::kStatsCollectionController << " and " << "--" << switches::kStatsCollectionController << " switch.";
<< "--" << switches::kReduceSecurityForStatsCollectionTests
<< " switches.";
return; return;
} }
base::HistogramBase* histogram = base::HistogramBase* histogram =
......
...@@ -245,11 +245,6 @@ const char kDisableXSSAuditor[] = "disable-xss-auditor"; ...@@ -245,11 +245,6 @@ const char kDisableXSSAuditor[] = "disable-xss-auditor";
// based tests. // based tests.
const char kDomAutomationController[] = "dom-automation"; const char kDomAutomationController[] = "dom-automation";
// Loosen security. Needed for tests using some of the functionality of
// |DOMAutomationController|.
const char kReduceSecurityForStatsCollectionTests[] =
"reduce-security-for-stats-collection-tests";
// Specifies if the |StatsCollectionController| needs to be bound in the // Specifies if the |StatsCollectionController| needs to be bound in the
// renderer. This binding happens on per-frame basis and hence can potentially // renderer. This binding happens on per-frame basis and hence can potentially
// be a performance bottleneck. One should only enable it when running a test // be a performance bottleneck. One should only enable it when running a test
......
...@@ -92,7 +92,6 @@ extern const char kDisableWebSecurity[]; ...@@ -92,7 +92,6 @@ extern const char kDisableWebSecurity[];
extern const char kEnableExperimentalWebSocket[]; extern const char kEnableExperimentalWebSocket[];
extern const char kDisableXSSAuditor[]; extern const char kDisableXSSAuditor[];
CONTENT_EXPORT extern const char kDomAutomationController[]; CONTENT_EXPORT extern const char kDomAutomationController[];
CONTENT_EXPORT extern const char kReduceSecurityForStatsCollectionTests[];
CONTENT_EXPORT extern const char kStatsCollectionController[]; CONTENT_EXPORT extern const char kStatsCollectionController[];
CONTENT_EXPORT extern const char kEnableAcceleratedFilters[]; CONTENT_EXPORT extern const char kEnableAcceleratedFilters[];
extern const char kEnableAccessibilityLogging[]; extern const char kEnableAccessibilityLogging[];
......
...@@ -38,8 +38,6 @@ class MemoryMeasurement(page_measurement.PageMeasurement): ...@@ -38,8 +38,6 @@ class MemoryMeasurement(page_measurement.PageMeasurement):
# pages. # pages.
options.AppendExtraBrowserArg('--disable-histogram-customizer') options.AppendExtraBrowserArg('--disable-histogram-customizer')
options.AppendExtraBrowserArg('--memory-metrics') options.AppendExtraBrowserArg('--memory-metrics')
options.AppendExtraBrowserArg(
'--reduce-security-for-stats-collection-tests')
# Old commandline flags used for reference builds. # Old commandline flags used for reference builds.
options.AppendExtraBrowserArg('--dom-automation') options.AppendExtraBrowserArg('--dom-automation')
......
...@@ -20,8 +20,6 @@ class PerfWarm(page_measurement.PageMeasurement): ...@@ -20,8 +20,6 @@ class PerfWarm(page_measurement.PageMeasurement):
def CustomizeBrowserOptions(self, options): def CustomizeBrowserOptions(self, options):
options.AppendExtraBrowserArg('--enable-stats-collection-bindings') options.AppendExtraBrowserArg('--enable-stats-collection-bindings')
options.AppendExtraBrowserArg(
'--reduce-security-for-stats-collection-tests')
# Old commandline flags used for reference builds. # Old commandline flags used for reference builds.
options.AppendExtraBrowserArg('--dom-automation') options.AppendExtraBrowserArg('--dom-automation')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment