| OLD | NEW |
| 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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 // Don't create StatisticsRecorder in the single process mode. | 248 // Don't create StatisticsRecorder in the single process mode. |
| 249 scoped_ptr<StatisticsRecorder> statistics; | 249 scoped_ptr<StatisticsRecorder> statistics; |
| 250 if (!StatisticsRecorder::WasStarted()) { | 250 if (!StatisticsRecorder::WasStarted()) { |
| 251 statistics.reset(new StatisticsRecorder()); | 251 statistics.reset(new StatisticsRecorder()); |
| 252 } | 252 } |
| 253 | 253 |
| 254 // Initialize statistical testing infrastructure. | 254 // Initialize statistical testing infrastructure. |
| 255 FieldTrialList field_trial; | 255 FieldTrialList field_trial; |
| 256 // Ensure any field trials in browser are reflected into renderer. | 256 // Ensure any field trials in browser are reflected into renderer. |
| 257 if (parsed_command_line.HasSwitch(switches::kForceFieldTestNameAndValue)) { | 257 if (parsed_command_line.HasSwitch(switches::kForceFieldTestNameAndValue)) { |
| 258 std::string persistent(WideToASCII(parsed_command_line.GetSwitchValue( | 258 std::string persistent = parsed_command_line.GetSwitchValueASCII( |
| 259 switches::kForceFieldTestNameAndValue))); | 259 switches::kForceFieldTestNameAndValue); |
| 260 bool ret = field_trial.StringAugmentsState(persistent); | 260 bool ret = field_trial.StringAugmentsState(persistent); |
| 261 DCHECK(ret); | 261 DCHECK(ret); |
| 262 } | 262 } |
| 263 | 263 |
| 264 // Load pepper plugins before engaging the sandbox. | 264 // Load pepper plugins before engaging the sandbox. |
| 265 PepperPluginRegistry::GetInstance(); | 265 PepperPluginRegistry::GetInstance(); |
| 266 | 266 |
| 267 { | 267 { |
| 268 #if !defined(OS_LINUX) | 268 #if !defined(OS_LINUX) |
| 269 // TODO(markus): Check if it is OK to unconditionally move this | 269 // TODO(markus): Check if it is OK to unconditionally move this |
| (...skipping 16 matching lines...) Expand all Loading... |
| 286 | 286 |
| 287 if (run_loop) { | 287 if (run_loop) { |
| 288 if (pool) | 288 if (pool) |
| 289 pool->Recycle(); | 289 pool->Recycle(); |
| 290 MessageLoop::current()->Run(); | 290 MessageLoop::current()->Run(); |
| 291 } | 291 } |
| 292 } | 292 } |
| 293 platform.PlatformUninitialize(); | 293 platform.PlatformUninitialize(); |
| 294 return 0; | 294 return 0; |
| 295 } | 295 } |
| OLD | NEW |