Disallow demo mode on devices that do not support ARC++.

Bug: 868105
Test: DemoSetupTest, DemoSetupArcUnsupportedTest
Change-Id: I5b4616c620dabf11704a02fd9345e22515e5a373
Reviewed-on: https://chromium-review.googlesource.com/1164560
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583137}

chrome/browser/chromeos/login/demo_mode/demo_setup_controller.cc

@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
@@ -18,6 +19,8 @@
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
+#include "chromeos/chromeos_switches.h"
+#include "components/arc/arc_util.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 namespace {
@@ -95,6 +98,22 @@ namespace chromeos {
 // static
 constexpr char DemoSetupController::kDemoModeDomain[];
 
+// static
+bool DemoSetupController::IsDemoModeAllowed() {
+  // Demo mode is only allowed on devices that support ARC++.
+  return arc::IsArcAvailable() &&
+         base::CommandLine::ForCurrentProcess()->HasSwitch(
+             switches::kEnableDemoMode);
+}
+
+// static
+bool DemoSetupController::IsOfflineDemoModeAllowed() {
+  // Offline demo mode can be only enabled when demo mode feature is enabled.
+  return IsDemoModeAllowed() &&
+         base::CommandLine::ForCurrentProcess()->HasSwitch(
+             switches::kEnableOfflineDemoMode);
+}
+
 // static
 bool DemoSetupController::IsOobeDemoSetupFlowInProgress() {
   const WizardController* const wizard_controller =

chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h

@@ -48,6 +48,13 @@ class DemoSetupController
   // Domain that demo mode devices are enrolled into.
   static constexpr char kDemoModeDomain[] = "cros-demo-mode.com";
 
+  // Utility method that returns whether demo mode is allowed on the device.
+  static bool IsDemoModeAllowed();
+
+  // Utility method that returns whether offline demo mode is allowed on the
+  // device.
+  static bool IsOfflineDemoModeAllowed();
+
   // Utility method that returns whether demo mode setup flow is in progress in
   // OOBE.
   static bool IsOobeDemoSetupFlowInProgress();

chrome/browser/chromeos/login/demo_setup_browsertest.cc

@@ -32,6 +32,7 @@
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "components/arc/arc_util.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_store.h"
 #include "content/public/test/browser_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -57,6 +58,8 @@ constexpr char kDefaultNetworkName[] = "eth1";
 constexpr base::TimeDelta kJsConditionCheckFrequency =
     base::TimeDelta::FromMilliseconds(10);
 
+constexpr int kInvokeDemoModeGestureTapsCount = 10;
+
 // How js query is executed.
 enum class JSExecution { kSync, kAsync };
 
@@ -169,6 +172,9 @@ class DemoSetupTest : public LoginManagerTest {
     LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(chromeos::switches::kEnableDemoMode);
     command_line->AppendSwitch(chromeos::switches::kEnableOfflineDemoMode);
+    command_line->AppendSwitchASCII(switches::kArcAvailability,
+                                    "officially-supported");
+    ASSERT_TRUE(arc::IsArcAvailable());
   }
 
   void SetUpOnMainThread() override {
@@ -238,10 +244,14 @@ class DemoSetupTest : public LoginManagerTest {
                   "Play Store Terms of Service');"));
   }
 
-  void InvokeDemoMode() {
+  void InvokeDemoModeWithAccelerator() {
     EXPECT_TRUE(JSExecute("cr.ui.Oobe.handleAccelerator('demo_mode');"));
   }
 
+  void InvokeDemoModeWithTaps() {
+    MultiTapOobeContainer(kInvokeDemoModeGestureTapsCount);
+  }
+
   // Simulates multi-tap gesture that consists of |tapCount| clicks on the OOBE
   // outer-container.
   void MultiTapOobeContainer(int tapsCount) {
@@ -459,7 +469,7 @@ class DemoSetupTest : public LoginManagerTest {
 IN_PROC_BROWSER_TEST_F(DemoSetupTest, ShowConfirmationDialogAndProceed) {
   EXPECT_FALSE(IsConfirmationDialogShown());
 
-  InvokeDemoMode();
+  InvokeDemoModeWithAccelerator();
   EXPECT_TRUE(IsConfirmationDialogShown());
 
   ClickOkOnConfirmationDialog();
@@ -471,7 +481,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupTest, ShowConfirmationDialogAndProceed) {
 IN_PROC_BROWSER_TEST_F(DemoSetupTest, ShowConfirmationDialogAndCancel) {
   EXPECT_FALSE(IsConfirmationDialogShown());
 
-  InvokeDemoMode();
+  InvokeDemoModeWithAccelerator();
   EXPECT_TRUE(IsConfirmationDialogShown());
 
   ClickCancelOnConfirmationDialog();
@@ -513,7 +523,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupTest, OnlineSetupFlowSuccess) {
       &MockDemoModeOnlineEnrollmentHelperCreator<DemoModeSetupResult::SUCCESS>);
   SimulateNetworkConnected();
 
-  InvokeDemoMode();
+  InvokeDemoModeWithAccelerator();
   ClickOkOnConfirmationDialog();
 
   OobeScreenWaiter(OobeScreen::SCREEN_OOBE_DEMO_PREFERENCES).Wait();
@@ -563,7 +573,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupTest, OnlineSetupFlowError) {
       &MockDemoModeOnlineEnrollmentHelperCreator<DemoModeSetupResult::ERROR>);
   SimulateNetworkConnected();
 
-  InvokeDemoMode();
+  InvokeDemoModeWithAccelerator();
   ClickOkOnConfirmationDialog();
 
   OobeScreenWaiter(OobeScreen::SCREEN_OOBE_DEMO_PREFERENCES).Wait();
@@ -614,7 +624,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupTest, OfflineSetupFlowSuccess) {
           DemoModeSetupResult::SUCCESS>);
   SimulateNetworkDisconnected();
 
-  InvokeDemoMode();
+  InvokeDemoModeWithAccelerator();
   ClickOkOnConfirmationDialog();
 
   // It needs to be done after demo setup controller was created (demo setup
@@ -658,7 +668,7 @@ IN_PROC_BROWSER_TEST_F(DemoSetupTest, OfflineSetupFlowError) {
       &MockDemoModeOfflineEnrollmentHelperCreator<DemoModeSetupResult::ERROR>);
   SimulateNetworkDisconnected();
 
-  InvokeDemoMode();
+  InvokeDemoModeWithAccelerator();
   ClickOkOnConfirmationDialog();
 
   // It needs to be done after demo setup controller was created (demo setup
@@ -814,4 +824,38 @@ IN_PROC_BROWSER_TEST_F(DemoSetupOfflineDisabledTest,
   EXPECT_FALSE(IsCustomNetworkListElementShown("offlineDemoSetupListItemName"));
 }
 
+class DemoSetupArcUnsupportedTest : public DemoSetupTest {
+ public:
+  DemoSetupArcUnsupportedTest() = default;
+  ~DemoSetupArcUnsupportedTest() override = default;
+
+  // DemoSetupTest:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    LoginManagerTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(chromeos::switches::kEnableDemoMode);
+    command_line->AppendSwitch(chromeos::switches::kEnableOfflineDemoMode);
+    command_line->AppendSwitchASCII(switches::kArcAvailability, "none");
+    ASSERT_FALSE(arc::IsArcAvailable());
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DemoSetupArcUnsupportedTest);
+};
+
+IN_PROC_BROWSER_TEST_F(DemoSetupArcUnsupportedTest, DoNotStartWithAccelerator) {
+  EXPECT_FALSE(IsConfirmationDialogShown());
+
+  InvokeDemoModeWithAccelerator();
+
+  EXPECT_FALSE(IsConfirmationDialogShown());
+}
+
+IN_PROC_BROWSER_TEST_F(DemoSetupArcUnsupportedTest, DoNotInvokeWithTaps) {
+  EXPECT_FALSE(IsConfirmationDialogShown());
+
+  InvokeDemoModeWithTaps();
+
+  EXPECT_FALSE(IsConfirmationDialogShown());
+}
+
 }  // namespace chromeos

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

@@ -10,12 +10,12 @@
 #include "ash/public/interfaces/event_rewriter_controller.mojom.h"
 #include "ash/shell.h"
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
+#include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
@@ -38,7 +38,6 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_constants.h"
-#include "chromeos/chromeos_switches.h"
 #include "components/login/base_screen_handler_utils.h"
 #include "components/login/localized_values_builder.h"
 #include "components/prefs/pref_service.h"
@@ -180,9 +179,8 @@ void CoreOobeHandler::Initialize() {
 void CoreOobeHandler::GetAdditionalParameters(base::DictionaryValue* dict) {
   dict->SetKey("isInTabletMode",
                base::Value(TabletModeClient::Get()->tablet_mode_enabled()));
-  bool is_demo_mode_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableDemoMode);
-  dict->SetKey("isDemoModeEnabled", base::Value(is_demo_mode_enabled));
+  dict->SetKey("isDemoModeEnabled",
+               base::Value(DemoSetupController::IsDemoModeAllowed()));
 }
 
 void CoreOobeHandler::RegisterMessages() {

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

@@ -6,7 +6,6 @@
 
 #include <stddef.h>
 
-#include "base/command_line.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_setup_controller.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
@@ -14,7 +13,6 @@
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
 #include "chrome/grit/generated_resources.h"
-#include "chromeos/chromeos_switches.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/login/localized_values_builder.h"
@@ -102,12 +100,8 @@ void NetworkScreenHandler::DeclareLocalizedValues(
 
 void NetworkScreenHandler::GetAdditionalParameters(
     base::DictionaryValue* dict) {
-  const auto* const command_line = base::CommandLine::ForCurrentProcess();
-  // Offline demo mode can be only enabled when demo mode feature is enabled.
-  const bool is_offline_demo_mode_enabled =
-      command_line->HasSwitch(switches::kEnableDemoMode) &&
-      command_line->HasSwitch(switches::kEnableOfflineDemoMode);
-  dict->SetBoolean("offlineDemoModeEnabled", is_offline_demo_mode_enabled);
+  dict->SetBoolean("offlineDemoModeEnabled",
+                   DemoSetupController::IsOfflineDemoModeAllowed());
 }
 
 void NetworkScreenHandler::Initialize() {