OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chrome_browser_field_trials_desktop.h" | 5 #include "chrome/browser/chrome_browser_field_trials_desktop.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/activity_tracker.h" |
10 #include "base/metrics/field_trial.h" | 11 #include "base/metrics/field_trial.h" |
11 #include "chrome/browser/prerender/prerender_field_trial.h" | 12 #include "chrome/browser/prerender/prerender_field_trial.h" |
12 #include "chrome/browser/tracing/background_tracing_field_trial.h" | 13 #include "chrome/browser/tracing/background_tracing_field_trial.h" |
13 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
14 #include "chrome/common/variations/variations_util.h" | 15 #include "chrome/common/variations/variations_util.h" |
15 #include "components/variations/variations_associated_data.h" | 16 #include "components/variations/variations_associated_data.h" |
16 #include "content/public/common/content_switches.h" | 17 #include "content/public/common/content_switches.h" |
17 | 18 |
18 namespace chrome { | 19 namespace chrome { |
19 | 20 |
(...skipping 25 matching lines...) Expand all Loading... |
45 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 46 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
46 switches::kWebRtcStunProbeTrialParameter, cmd_param); | 47 switches::kWebRtcStunProbeTrialParameter, cmd_param); |
47 #endif | 48 #endif |
48 } | 49 } |
49 | 50 |
50 } // namespace | 51 } // namespace |
51 | 52 |
52 void SetupDesktopFieldTrials(const base::CommandLine& parsed_command_line) { | 53 void SetupDesktopFieldTrials(const base::CommandLine& parsed_command_line) { |
53 prerender::ConfigurePrerender(parsed_command_line); | 54 prerender::ConfigurePrerender(parsed_command_line); |
54 SetupLightSpeedTrials(); | 55 SetupLightSpeedTrials(); |
| 56 base::debug::SetupGlobalActivityTrackerFieldTrial(); |
55 tracing::SetupBackgroundTracingFieldTrial(); | 57 tracing::SetupBackgroundTracingFieldTrial(); |
56 SetupStunProbeTrial(); | 58 SetupStunProbeTrial(); |
57 } | 59 } |
58 | 60 |
59 } // namespace chrome | 61 } // namespace chrome |
OLD | NEW |