Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: chrome/renderer/renderer_main.cc

Issue 5784005: Properly lock access to static variables.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/metrics/histogram.cc ('k') | net/socket_stream/socket_stream_metrics_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #if defined(OS_MACOSX) 5 #if defined(OS_MACOSX)
6 #include <signal.h> 6 #include <signal.h>
7 #include <unistd.h> 7 #include <unistd.h>
8 #endif // OS_MACOSX 8 #endif // OS_MACOSX
9 9
10 #include "app/hi_res_timer_manager.h" 10 #include "app/hi_res_timer_manager.h"
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 HighResolutionTimerManager hi_res_timer_manager; 244 HighResolutionTimerManager hi_res_timer_manager;
245 245
246 platform.PlatformInitialize(); 246 platform.PlatformInitialize();
247 247
248 bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox); 248 bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
249 platform.InitSandboxTests(no_sandbox); 249 platform.InitSandboxTests(no_sandbox);
250 250
251 // Initialize histogram statistics gathering system. 251 // Initialize histogram statistics gathering system.
252 // Don't create StatisticsRecorder in the single process mode. 252 // Don't create StatisticsRecorder in the single process mode.
253 scoped_ptr<base::StatisticsRecorder> statistics; 253 scoped_ptr<base::StatisticsRecorder> statistics;
254 if (!base::StatisticsRecorder::WasStarted()) { 254 if (!base::StatisticsRecorder::IsActive()) {
255 statistics.reset(new base::StatisticsRecorder()); 255 statistics.reset(new base::StatisticsRecorder());
256 } 256 }
257 257
258 // Initialize statistical testing infrastructure. 258 // Initialize statistical testing infrastructure.
259 base::FieldTrialList field_trial; 259 base::FieldTrialList field_trial;
260 // Ensure any field trials in browser are reflected into renderer. 260 // Ensure any field trials in browser are reflected into renderer.
261 if (parsed_command_line.HasSwitch(switches::kForceFieldTestNameAndValue)) { 261 if (parsed_command_line.HasSwitch(switches::kForceFieldTestNameAndValue)) {
262 std::string persistent = parsed_command_line.GetSwitchValueASCII( 262 std::string persistent = parsed_command_line.GetSwitchValueASCII(
263 switches::kForceFieldTestNameAndValue); 263 switches::kForceFieldTestNameAndValue);
264 bool ret = field_trial.StringAugmentsState(persistent); 264 bool ret = field_trial.StringAugmentsState(persistent);
(...skipping 30 matching lines...) Expand all
295 pool->Recycle(); 295 pool->Recycle();
296 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0); 296 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0);
297 MessageLoop::current()->Run(); 297 MessageLoop::current()->Run();
298 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0); 298 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0);
299 } 299 }
300 } 300 }
301 platform.PlatformUninitialize(); 301 platform.PlatformUninitialize();
302 TRACE_EVENT_END("RendererMain", 0, ""); 302 TRACE_EVENT_END("RendererMain", 0, "");
303 return 0; 303 return 0;
304 } 304 }
OLDNEW
« no previous file with comments | « base/metrics/histogram.cc ('k') | net/socket_stream/socket_stream_metrics_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698