Don't skip ARC ToS due to policies if ArcEnabled is not managed

chrome/browser/chromeos/arc/arc_session_manager_unittest.cc

 // Copyright 2016 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 <memory>
 #include <string>
 #include <tuple>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 458 matching lines @@
   EXPECT_FALSE(arc_session_manager()->arc_start_time().is_null());
 
   ASSERT_EQ(ArcSessionManager::State::ACTIVE, arc_session_manager()->state());
   ASSERT_TRUE(arc_session_manager()->IsSessionRunning());
 
   arc_session_manager()->Shutdown();
 }
 
 class ArcSessionManagerPolicyTest
     : public ArcSessionManagerTest,
-      public testing::WithParamInterface<std::tuple<base::Value, base::Value>> {
+      public testing::WithParamInterface<
+          std::tuple<bool, base::Value, base::Value>> {
  public:
+  bool arc_enabled_pref_managed() const { return std::get<0>(GetParam()); }
+
   const base::Value& backup_restore_pref_value() const {
-    return std::get<0>(GetParam());
+    return std::get<1>(GetParam());
   }
 
   const base::Value& location_service_pref_value() const {
-    return std::get<1>(GetParam());
+    return std::get<2>(GetParam());
   }
 };
 
 TEST_P(ArcSessionManagerPolicyTest, SkippingTerms) {
   sync_preferences::TestingPrefServiceSyncable* const prefs =
       profile()->GetTestingPrefService();
 
   // Backup-restore and location-service prefs are off by default.
   EXPECT_FALSE(prefs->GetBoolean(prefs::kArcSignedIn));
   EXPECT_FALSE(prefs->GetBoolean(prefs::kArcTermsAccepted));
 
-  // Set ARC to be managed.
-  prefs->SetManagedPref(prefs::kArcEnabled, new base::Value(true));
+  // Enable ARC through user pref or by policy, according to the test parameter.
+  if (arc_enabled_pref_managed())
+    prefs->SetManagedPref(prefs::kArcEnabled, new base::Value(true));
+  else
+    prefs->SetBoolean(prefs::kArcEnabled, true);
+  EXPECT_TRUE(IsArcPlayStoreEnabledForProfile(profile()));
 
   // Assign test values to the prefs.
   if (backup_restore_pref_value().is_bool()) {
     prefs->SetManagedPref(prefs::kArcBackupRestoreEnabled,
                           backup_restore_pref_value().DeepCopy());
   }
   if (location_service_pref_value().is_bool()) {
     prefs->SetManagedPref(prefs::kArcLocationServiceEnabled,
                           location_service_pref_value().DeepCopy());
   }
-  EXPECT_TRUE(arc::IsArcPlayStoreEnabledForProfile(profile()));
-  EXPECT_TRUE(arc::IsArcPlayStoreEnabledPreferenceManagedForProfile(profile()));
 
   arc_session_manager()->SetProfile(profile());
   arc_session_manager()->RequestEnable();
 
-  // Terms of Service are skipped if both ArcBackupRestoreEnabled and
-  // ArcLocationServiceEnabled are managed.
-  const bool expected_terms_skipping = backup_restore_pref_value().is_bool() &&
+  // Terms of Service are skipped iff ARC is enabled by policy and both
+  // ArcBackupRestoreEnabled and ArcLocationServiceEnabled are managed.
+  const bool expected_terms_skipping = arc_enabled_pref_managed() &&
+                                       backup_restore_pref_value().is_bool() &&
                                        location_service_pref_value().is_bool();
   EXPECT_EQ(expected_terms_skipping
                 ? ArcSessionManager::State::ACTIVE
                 : ArcSessionManager::State::NEGOTIATING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
 
   // Complete provisioning if it's not done yet.
   if (!expected_terms_skipping) {
     arc_session_manager()->StartArcForTesting();
     arc_session_manager()->OnProvisioningFinished(ProvisioningResult::SUCCESS);
@@ skipping 17 matching lines @@
   // Stop ARC and shutdown the service.
   prefs->RemoveManagedPref(prefs::kArcEnabled);
   WaitForDataRemoved(ArcSessionManager::State::STOPPED);
   arc_session_manager()->Shutdown();
 }
 
 INSTANTIATE_TEST_CASE_P(
     ArcSessionManagerPolicyTest,
     ArcSessionManagerPolicyTest,
     testing::Combine(
-        testing::Values(base::Value(), base::Value(false), base::Value(true)),
-        testing::Values(base::Value(), base::Value(false), base::Value(true))));
+        testing::Values(false, true) /* arc_enabled_pref_managed */,
+        testing::Values(base::Value(),
+                        base::Value(false),
+                        base::Value(true)) /* backup_restore_pref_value */,
+        testing::Values(base::Value(),
+                        base::Value(false),
+                        base::Value(true)) /* location_service_pref_value */));
 
 class ArcSessionManagerKioskTest : public ArcSessionManagerTestBase {
  public:
   ArcSessionManagerKioskTest() = default;
 
   void SetUp() override {
     ArcSessionManagerTestBase::SetUp();
     const AccountId account_id(
         AccountId::FromUserEmail(profile()->GetProfileUserName()));
     GetFakeUserManager()->AddArcKioskAppUser(account_id);
@@ skipping 190 matching lines @@
   // ArcPlayStoreEnabledPreferenceHandler is not running, so the state should
   // be kept as is.
   EXPECT_EQ(ArcSessionManager::State::NEGOTIATING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   // Managed user's preference should not be overwritten.
   if (!IsManagedUser())
     EXPECT_FALSE(IsArcPlayStoreEnabledForProfile(profile()));
 }
 
 }  // namespace arc