diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 19:33:56 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 19:33:56 +0000 |
| commit | b3aabd34198e0e62cd1ca2134200c6a948560ca6 (patch) | |
| tree | 19744277f82538d11c45001b31ab3d20420f8f69 /content/renderer/renderer_main.cc | |
| parent | 3167bd4f7389abfc5ff4010f09c4b6045b8e8311 (diff) | |
| download | chromium_src-b3aabd34198e0e62cd1ca2134200c6a948560ca6.zip chromium_src-b3aabd34198e0e62cd1ca2134200c6a948560ca6.tar.gz chromium_src-b3aabd34198e0e62cd1ca2134200c6a948560ca6.tar.bz2 | |
Tighten up DEPS some more. NaCl/service process code are including internal content files. Fix the instances other sandbox stuff, which I'll do in a followup.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10512010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/renderer_main.cc')
| -rw-r--r-- | content/renderer/renderer_main.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 07d5313..b98030b 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/debug/trace_event.h" +#include "base/hi_res_timer_manager.h" #include "base/i18n/rtl.h" #include "base/memory/ref_counted.h" #include "base/metrics/field_trial.h" @@ -18,8 +19,6 @@ #include "base/system_monitor/system_monitor.h" #include "base/threading/platform_thread.h" #include "base/time.h" -#include "content/common/content_counters.h" -#include "content/common/hi_res_timer_manager.h" #include "content/common/pepper_plugin_registry.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" @@ -188,8 +187,8 @@ int RendererMain(const content::MainFunctionParams& parameters) { content::GetContentClient()->renderer()->RegisterPPAPIInterfaceFactories( factory_manager); - base::StatsScope<base::StatsCounterTimer> - startup_timer(content::Counters::renderer_main()); + base::StatsCounterTimer stats_counter_timer("Content.RendererInit"); + base::StatsScope<base::StatsCounterTimer> startup_timer(stats_counter_timer); RendererMessageLoopObserver task_observer; #if defined(OS_MACOSX) |