| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include "app/l10n_util.h" | 5 #include "app/l10n_util.h" |
| 6 #include "app/resource_bundle.h" | 6 #include "app/resource_bundle.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/field_trial.h" | 8 #include "base/field_trial.h" |
| 9 #include "base/histogram.h" | 9 #include "base/histogram.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 if (!StatisticsRecorder::WasStarted()) { | 103 if (!StatisticsRecorder::WasStarted()) { |
| 104 statistics.reset(new StatisticsRecorder()); | 104 statistics.reset(new StatisticsRecorder()); |
| 105 } | 105 } |
| 106 | 106 |
| 107 // Initialize statistical testing infrastructure. | 107 // Initialize statistical testing infrastructure. |
| 108 FieldTrialList field_trial; | 108 FieldTrialList field_trial; |
| 109 // Ensure any field trials in browser are reflected into renderer. | 109 // Ensure any field trials in browser are reflected into renderer. |
| 110 if (parsed_command_line.HasSwitch(switches::kForceFieldTestNameAndValue)) { | 110 if (parsed_command_line.HasSwitch(switches::kForceFieldTestNameAndValue)) { |
| 111 std::string persistent(WideToASCII(parsed_command_line.GetSwitchValue( | 111 std::string persistent(WideToASCII(parsed_command_line.GetSwitchValue( |
| 112 switches::kForceFieldTestNameAndValue))); | 112 switches::kForceFieldTestNameAndValue))); |
| 113 FieldTrial *field_trial = FieldTrial::RestorePersistentString(persistent); | 113 bool ret = field_trial.StringAugmentsState(persistent); |
| 114 DCHECK(field_trial); | 114 DCHECK(ret); |
| 115 } | 115 } |
| 116 | 116 |
| 117 { | 117 { |
| 118 RenderProcess render_process; | 118 RenderProcess render_process; |
| 119 bool run_loop = true; | 119 bool run_loop = true; |
| 120 if (!no_sandbox) { | 120 if (!no_sandbox) { |
| 121 run_loop = platform.EnableSandbox(); | 121 run_loop = platform.EnableSandbox(); |
| 122 } | 122 } |
| 123 | 123 |
| 124 platform.RunSandboxTests(); | 124 platform.RunSandboxTests(); |
| 125 | 125 |
| 126 startup_timer.Stop(); // End of Startup Time Measurement. | 126 startup_timer.Stop(); // End of Startup Time Measurement. |
| 127 | 127 |
| 128 if (run_loop) { | 128 if (run_loop) { |
| 129 // Load the accelerator table from the browser executable and tell the | 129 // Load the accelerator table from the browser executable and tell the |
| 130 // message loop to use it when translating messages. | 130 // message loop to use it when translating messages. |
| 131 if (pool) pool->Recycle(); | 131 if (pool) pool->Recycle(); |
| 132 MessageLoop::current()->Run(); | 132 MessageLoop::current()->Run(); |
| 133 } | 133 } |
| 134 } | 134 } |
| 135 platform.PlatformUninitialize(); | 135 platform.PlatformUninitialize(); |
| 136 return 0; | 136 return 0; |
| 137 } | 137 } |
| OLD | NEW |