| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 0fc08e52714519b58a083013b27be6c969c3569c..1d7c829bee7e1906f2d64424bd98905cabfbca16 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -70,6 +70,7 @@
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| +#include "chrome/browser/rlz/rlz.h"
|
| #include "chrome/browser/signin/token_service_factory.h"
|
| #include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| @@ -496,6 +497,11 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
|
| &tracker_);
|
| #endif
|
|
|
| +#if defined(ENABLE_RLZ)
|
| + if (parsed_command_line().HasSwitch(::switches::kTestType))
|
| + RLZTracker::EnableZeroDelayForTesting();
|
| +#endif
|
| +
|
| // In Aura builds this will initialize ash::Shell.
|
| ChromeBrowserMainPartsLinux::PreProfileInit();
|
| }
|
| @@ -521,6 +527,9 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
|
| 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
|
|
|