summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main.cc
diff options
context:
space:
mode:
authoroysteine <oysteine@chromium.org>2014-11-20 16:57:23 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-21 00:57:40 +0000
commit991568bbf333913fe20b760b49ea02d53b806354 (patch)
treed33aeffd63ff6084352ea63e2a6a1cb8f6104674 /chrome/browser/chrome_browser_main.cc
parentafbe64d30ca8dd895dc0afcf507bf48749c69208 (diff)
downloadchromium_src-991568bbf333913fe20b760b49ea02d53b806354.zip
chromium_src-991568bbf333913fe20b760b49ea02d53b806354.tar.gz
chromium_src-991568bbf333913fe20b760b49ea02d53b806354.tar.bz2
Setting --enable-gpu-benchmarking should force all Finch trials to default
R=thestig@chromium.org,asvitkine@chromium.org,cpu@chromium.org BUG=434756 Review URL: https://codereview.chromium.org/744483002 Cr-Commit-Position: refs/heads/master@{#305129}
Diffstat (limited to 'chrome/browser/chrome_browser_main.cc')
-rw-r--r--chrome/browser/chrome_browser_main.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 7a1d7c9..c5676bd 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -37,6 +37,7 @@
#include "base/time/time.h"
#include "base/values.h"
#include "build/build_config.h"
+#include "cc/base/switches.h"
#include "chrome/browser/about_flags.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_impl.h"
@@ -602,8 +603,10 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() {
new base::FieldTrialList(metrics->CreateEntropyProvider().release()));
const CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(switches::kEnableBenchmarking))
+ if (command_line->HasSwitch(switches::kEnableBenchmarking) ||
+ command_line->HasSwitch(cc::switches::kEnableGpuBenchmarking)) {
base::FieldTrial::EnableBenchmarking();
+ }
// Ensure any field trials specified on the command line are initialized.
if (command_line->HasSwitch(switches::kForceFieldTrials)) {