| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index fc65c210e0499d7bfc11fc7fd4deee125457285e..ad4e0cafae10956f54fe00951e157c501c1bd060 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -1365,6 +1365,25 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {
|
| // just changed it to include experiments.
|
| child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
|
|
|
| + InitializeNetworkOptions(parsed_command_line());
|
| + InitializeURLRequestThrottlerManager(browser_process_->net_log());
|
| +
|
| + // Initialize histogram synchronizer system. This is a singleton and is used
|
| + // for posting tasks via NewRunnableMethod. Its deleted when it goes out of
|
| + // scope. Even though NewRunnableMethod does AddRef and Release, the object
|
| + // will not be deleted after the Task is executed.
|
| + histogram_synchronizer_ = new HistogramSynchronizer();
|
| +
|
| + // Now the command line has been mutated based on about:flags, we can
|
| + // set up metrics and initialize field trials.
|
| + MetricsService* metrics =
|
| + SetupMetricsAndFieldTrials(parsed_command_line(), local_state);
|
| +
|
| +#if defined(USE_WEBKIT_COMPOSITOR)
|
| + // We need to ensure WebKit has been initialized before we start the WebKit
|
| + // compositor. This is done by the ResourceDispatcherHost on creation.
|
| + g_browser_process->resource_dispatcher_host();
|
| +#endif
|
| #if defined(USE_AURA)
|
| // Shell takes ownership of ChromeShellDelegate.
|
| aura_shell::Shell::GetInstance()->SetDelegate(new ChromeShellDelegate);
|
| @@ -1393,20 +1412,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {
|
| }
|
| #endif
|
|
|
| - InitializeNetworkOptions(parsed_command_line());
|
| - InitializeURLRequestThrottlerManager(browser_process_->net_log());
|
| -
|
| - // Initialize histogram synchronizer system. This is a singleton and is used
|
| - // for posting tasks via NewRunnableMethod. Its deleted when it goes out of
|
| - // scope. Even though NewRunnableMethod does AddRef and Release, the object
|
| - // will not be deleted after the Task is executed.
|
| - histogram_synchronizer_ = new HistogramSynchronizer();
|
| -
|
| - // Now the command line has been mutated based on about:flags, we can
|
| - // set up metrics and initialize field trials.
|
| - MetricsService* metrics =
|
| - SetupMetricsAndFieldTrials(parsed_command_line(), local_state);
|
| -
|
| // Now that all preferences have been registered, set the install date
|
| // for the uninstall metrics if this is our first run. This only actually
|
| // gets used if the user has metrics reporting enabled at uninstall time.
|
|
|