Index: chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc |
index b65e16bd765890e8f58ecd6f424dd4af8ddfefea..0c88882f7934986e6e7a98f219476db7c6e8dfaa 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc |
@@ -39,7 +39,13 @@ void DemoModeDetector::InitDetection() { |
switches::kDisableDemoMode)) |
return; |
- if (base::SysInfo::IsRunningOnChromeOS()) { |
+ const bool has_derelict_switch = |
+ base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kDerelictDetectionTimeout) || |
+ base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kDerelictIdleTimeout); |
+ |
+ if (base::SysInfo::IsRunningOnChromeOS() && !has_derelict_switch) { |
std::string track; |
// We're running on an actual device; if we cannot find our release track |
// value or if the track contains "testimage", don't start demo mode. |