Check for channel and flag before allowing demo mode.

chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc

 // Copyright 2014 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/ui/webui/chromeos/login/demo_mode_detector.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/sys_info.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 
 namespace {
   const int kDerelectDetectionTimeoutSeconds = 8 * 60 * 60;  // 8 hours.
   const int kDerelectIdleTimeoutSeconds = 5 * 60;            // 5 minutes.
   const int kOobeTimerUpdateIntervalSeconds = 5 * 60;        // 5 minutes.
 }  // namespace
 
 namespace chromeos {
 
 DemoModeDetector::DemoModeDetector()
     : demo_launched_(false),
       weak_ptr_factory_(this) {
   SetupTimeouts();
 }
 
 DemoModeDetector::~DemoModeDetector() {
 }
 
 // Public methods.
 
 void DemoModeDetector::InitDetection() {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableDemoMode))
+    return;
+  if (base::SysInfo::IsRunningOnChromeOS()) {

[xiyuan, 2014/08/28 19:25:51]

nit: insert an empty line before this line

[rkc, 2014/08/28 19:38:19]

Done.

+    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.
+    if (!base::SysInfo::GetLsbReleaseValue("CHROMEOS_RELEASE_TRACK", &track) ||
+        track.find("testimage") != std::string::npos)
+      return;
+  }
+
   if (IsDerelict())
     StartIdleDetection();
   else
     StartOobeTimer();
 }
 
 void DemoModeDetector::StopDetection() {
   idle_detector_.reset();
 }
 
@@ skipping 87 matching lines @@
       std::max(std::min(oobe_timer_update_interval_,
                         derelict_detection_timeout_ - time_on_oobe_),
                base::TimeDelta::FromSeconds(0));
 }
 
 bool DemoModeDetector::IsDerelict() {
   return time_on_oobe_ >= derelict_detection_timeout_;
 }
 
 }  // namespace chromeos