Merge 199159 "Removed visual jank during kiosk app launch caused..."

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 596 matching lines @@
   WallpaperManager::Get()->AddObservers();
 
 #if defined(USE_LINUX_BREAKPAD)
   cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL,
                                   base::Bind(&ChromeOSVersionCallback),
                                   &tracker_);
 #endif
 
   storage_monitor_.reset(new StorageMonitorCros());
 
+  // Make sure that wallpaper boot transition and other delays in OOBE
+  // are disabled for tests and kiosk app launch by default.
+  // Individual tests may enable them if they want.
+  if (parsed_command_line().HasSwitch(::switches::kTestType) ||
+      ShouldAutoLaunchKioskApp(parsed_command_line())) {
+    WizardController::SetZeroDelays();
+  }
+
   // In Aura builds this will initialize ash::Shell.
   ChromeBrowserMainPartsLinux::PreProfileInit();
 }
 
 void ChromeBrowserMainPartsChromeos::PostProfileInit() {
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- just after CreateProfile().
 
   if (parsed_command_line().HasSwitch(switches::kLoginUser) &&
       !parsed_command_line().HasSwitch(switches::kLoginPassword)) {
     // Make sure we flip every profile to not share proxies if the user hasn't
     // specified so explicitly.
     const PrefService::Preference* use_shared_proxies_pref =
         profile()->GetPrefs()->FindPreference(prefs::kUseSharedProxies);
     if (use_shared_proxies_pref->IsDefaultValue())
       profile()->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
 
     // This is done in LoginUtils::OnProfileCreated during normal login.
     LoginUtils::Get()->InitRlzDelayed(profile());
   }
 
   // Make sure the NetworkConfigurationUpdater is ready so that it pushes ONC
   // configuration before login.
   g_browser_process->browser_policy_connector()->
       GetNetworkConfigurationUpdater();
 
-  // Make sure that wallpaper boot transition and other delays in OOBE
-  // are disabled for tests by default.
-  // Individual tests may enable them if they want.
-  if (parsed_command_line().HasSwitch(::switches::kTestType))
-    WizardController::SetZeroDelays();
-
   // Start loading the machine statistics. Note: if we start loading machine
   // statistics early in PreEarlyInitialization() then the crossystem tool
   // sometimes hangs for unknown reasons, see http://crbug.com/167671.
   // Also we must start loading no later than this point, because login manager
   // may call GetMachineStatistic() during startup, see crbug.com/170635.
   system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics();
 
   // Tests should be able to tune login manager before showing it.
   // Thus only show login manager in normal (non-testing) mode.
   if (!parameters().ui_task ||
@@ skipping 240 matching lines @@
   trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
   trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
   trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
   trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
   // This is necessary to start the experiment as a side effect.
   trial->group();
 }
 
 }  //  namespace chromeos