summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 04:38:38 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 04:38:38 +0000
commit835d7c811c98f179090c57a827a9c9baa2130435 (patch)
treeedcff6b2c9029c6f867f650d762837f2485d99fb /chrome/app
parent4b1deac7ba7e7a6bf0425e6ed4db26e0c29daa7f (diff)
downloadchromium_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/app')
-rw-r--r--chrome/app/chrome_dll_main.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index c08e109..dad27d8 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -40,11 +40,11 @@
#include "base/debug_util.h"
#include "base/i18n/icu_util.h"
#include "base/message_loop.h"
+#include "base/metrics/stats_counters.h"
+#include "base/metrics/stats_table.h"
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/scoped_nsautorelease_pool.h"
-#include "base/stats_counters.h"
-#include "base/stats_table.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
@@ -450,9 +450,9 @@ void InitializeStatsTable(base::ProcessId browser_pid,
std::string statsfile =
StringPrintf("%s-%u", chrome::kStatsFilename,
static_cast<unsigned int>(browser_pid));
- StatsTable *stats_table = new StatsTable(statsfile,
+ base::StatsTable *stats_table = new base::StatsTable(statsfile,
chrome::kStatsMaxThreads, chrome::kStatsMaxCounters);
- StatsTable::set_current(stats_table);
+ base::StatsTable::set_current(stats_table);
}
}
@@ -705,7 +705,7 @@ int ChromeMain(int argc, char** argv) {
InitializeStatsTable(browser_pid, parsed_command_line);
- StatsScope<StatsCounterTimer>
+ base::StatsScope<base::StatsCounterTimer>
startup_timer(chrome::Counters::chrome_main());
// Enable the heap profiler as early as possible!