diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 04:38:38 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 04:38:38 +0000 |
| commit | 835d7c811c98f179090c57a827a9c9baa2130435 (patch) | |
| tree | edcff6b2c9029c6f867f650d762837f2485d99fb /chrome/renderer/renderer_main.cc | |
| parent | 4b1deac7ba7e7a6bf0425e6ed4db26e0c29daa7f (diff) | |
| download | chromium_src-835d7c811c98f179090c57a827a9c9baa2130435.zip chromium_src-835d7c811c98f179090c57a827a9c9baa2130435.tar.gz chromium_src-835d7c811c98f179090c57a827a9c9baa2130435.tar.bz2 | |
Move Stats, histograms, and field trial into a metrics subdirectory of base and
put them in the base namespace.
TEST=it compiles
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62510 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_main.cc')
| -rw-r--r-- | chrome/renderer/renderer_main.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc index dae703a..83dcd07 100644 --- a/chrome/renderer/renderer_main.cc +++ b/chrome/renderer/renderer_main.cc @@ -10,14 +10,14 @@ #include "app/hi_res_timer_manager.h" #include "app/system_monitor.h" #include "base/command_line.h" -#include "base/field_trial.h" -#include "base/histogram.h" +#include "base/metrics/field_trial.h" #include "base/message_loop.h" +#include "base/metrics/histogram.h" +#include "base/metrics/stats_counters.h" #include "base/path_service.h" #include "base/platform_thread.h" #include "base/process_util.h" #include "base/scoped_nsautorelease_pool.h" -#include "base/stats_counters.h" #include "base/string_util.h" #include "base/trace_event.h" #include "chrome/common/chrome_constants.h" @@ -223,7 +223,7 @@ int RendererMain(const MainFunctionParams& parameters) { RendererMainPlatformDelegate platform(parameters); - StatsScope<StatsCounterTimer> + base::StatsScope<base::StatsCounterTimer> startup_timer(chrome::Counters::renderer_main()); #if defined(OS_MACOSX) @@ -249,13 +249,13 @@ int RendererMain(const MainFunctionParams& parameters) { // Initialize histogram statistics gathering system. // Don't create StatisticsRecorder in the single process mode. - scoped_ptr<StatisticsRecorder> statistics; - if (!StatisticsRecorder::WasStarted()) { - statistics.reset(new StatisticsRecorder()); + scoped_ptr<base::StatisticsRecorder> statistics; + if (!base::StatisticsRecorder::WasStarted()) { + statistics.reset(new base::StatisticsRecorder()); } // Initialize statistical testing infrastructure. - FieldTrialList field_trial; + base::FieldTrialList field_trial; // Ensure any field trials in browser are reflected into renderer. if (parsed_command_line.HasSwitch(switches::kForceFieldTestNameAndValue)) { std::string persistent = parsed_command_line.GetSwitchValueASCII( |