Extract kArcEnabled preference from ArcSessionManager part 1.

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"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/observer_list.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/arc/arc_optin_uma.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
+#include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h"
 #include "chrome/browser/chromeos/arc/test/arc_data_removed_waiter.h"
 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h"
 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
@@ skipping 340 matching lines @@
   ASSERT_EQ(ArcSessionManager::State::ACTIVE, arc_session_manager()->state());
 
   arc_session_manager()->CancelAuthCode();
   ASSERT_EQ(ArcSessionManager::State::ACTIVE, arc_session_manager()->state());
   ASSERT_TRUE(pref->GetBoolean(prefs::kArcEnabled));
 
   // Correctly stop service.
   arc_session_manager()->Shutdown();
 }
 
-TEST_F(ArcSessionManagerTest, EnableDisablesArc) {
-  const PrefService* pref = profile()->GetPrefs();
-  arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
-
-  EXPECT_FALSE(pref->GetBoolean(prefs::kArcEnabled));
-  arc_session_manager()->SetArcPlayStoreEnabled(true);
-  EXPECT_TRUE(pref->GetBoolean(prefs::kArcEnabled));
-  arc_session_manager()->SetArcPlayStoreEnabled(false);
-  EXPECT_FALSE(pref->GetBoolean(prefs::kArcEnabled));
-
-  // Correctly stop service.
-  arc_session_manager()->Shutdown();
-}
-
 TEST_F(ArcSessionManagerTest, SignInStatus) {
   PrefService* const prefs = profile()->GetPrefs();
 
   EXPECT_TRUE(arc_session_manager()->sign_in_start_time().is_null());
   EXPECT_TRUE(arc_session_manager()->arc_start_time().is_null());
 
   EXPECT_FALSE(prefs->GetBoolean(prefs::kArcSignedIn));
   prefs->SetBoolean(prefs::kArcEnabled, true);
 
   arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
@@ skipping 192 matching lines @@
   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());
   }
 
   arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
-  EXPECT_TRUE(arc_session_manager()->IsArcPlayStoreEnabled());
-  EXPECT_TRUE(arc_session_manager()->IsArcManaged());
+  EXPECT_TRUE(arc::IsArcPlayStoreEnabledForProfile(profile()));
+  EXPECT_TRUE(arc::IsArcPlayStoreEnabledPreferenceManagedForProfile(profile()));
 
   // Terms of Service should be skipped if both ArcBackupRestoreEnabled and
   // ArcLocationServiceEnabled are managed.
   const ArcSessionManager::State expected_state =
       backup_restore_pref_value().is_bool() &&
               location_service_pref_value().is_bool()
           ? ArcSessionManager::State::ACTIVE
           : ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE;
   EXPECT_EQ(expected_state, arc_session_manager()->state());
 
@@ skipping 199 matching lines @@
                         ArcSessionOobeOptInNegotiatorTest,
                         ::testing::Values(true, false));
 
 TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsAccepted) {
   actor()->Show();
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   ReportResult(true);
   EXPECT_EQ(ArcSessionManager::State::ACTIVE, arc_session_manager()->state());
-  EXPECT_TRUE(arc_session_manager()->IsArcPlayStoreEnabled());
+  EXPECT_TRUE(IsArcPlayStoreEnabledForProfile(profile()));
 }
 
 TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsRejected) {
   actor()->Show();
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   ReportResult(false);
   EXPECT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
-  EXPECT_FALSE(!IsManagedUser() &&
-               arc_session_manager()->IsArcPlayStoreEnabled());
+  if (!IsManagedUser())
+    EXPECT_FALSE(IsArcPlayStoreEnabledForProfile(profile()));
 }
 
 TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsActorDestroyed) {
   actor()->Show();
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   CloseLoginDisplayHost();
   ReportActorDestroyed();
   EXPECT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
-  EXPECT_FALSE(!IsManagedUser() &&
-               arc_session_manager()->IsArcPlayStoreEnabled());
+  if (!IsManagedUser())
+    EXPECT_FALSE(IsArcPlayStoreEnabledForProfile(profile()));
 }
 
 }  // namespace arc