Revert 106606 - Use WebKit compositor in ui::Layer

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1347 matching lines @@
         switches::kBlockReadingThirdPartyCookies);
 
   // Convert active labs into switches. Modifies the current command line.
   about_flags::ConvertFlagsToSwitches(local_state,
                                       CommandLine::ForCurrentProcess());
 
   // Reset the command line in the crash report details, since we may have
   // 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);
 #elif defined(TOOLKIT_VIEWS)
   views::Widget::SetPureViews(
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
   // Launch the views desktop shell window and register it as the default parent
   // for all unparented views widgets.
   if (parsed_command_line().HasSwitch(switches::kViewsDesktop)) {
     std::string desktop_type_cmd =
         parsed_command_line().GetSwitchValueASCII(switches::kViewsDesktop);
     if (desktop_type_cmd != "disabled") {
       views::desktop::DesktopWindowView::DesktopType desktop_type;
       if (desktop_type_cmd == "netbook")
         desktop_type = views::desktop::DesktopWindowView::DESKTOP_NETBOOK;
       else if (desktop_type_cmd == "other")
         desktop_type = views::desktop::DesktopWindowView::DESKTOP_OTHER;
       else
         desktop_type = views::desktop::DesktopWindowView::DESKTOP_DEFAULT;
       views::desktop::DesktopWindowView::CreateDesktopWindow(desktop_type);
       ChromeViewsDelegate* chrome_views_delegate = static_cast
           <ChromeViewsDelegate*>(views::ViewsDelegate::views_delegate);
       chrome_views_delegate->default_parent_view =
         views::desktop::DesktopWindowView::desktop_window_view;
     }
   }
 #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.
   int64 install_date =
       local_state->GetInt64(prefs::kUninstallMetricsInstallDate);
   if (install_date == 0) {
     local_state->SetInt64(prefs::kUninstallMetricsInstallDate,
                           base::Time::Now().ToTimeT());
   }
 
@@ skipping 671 matching lines @@
   if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
       (pre_read == "0" || pre_read == "1")) {
     std::string uma_name(name);
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }