Split DisabledForEphemeralDataUsers tests into ChromeArcUtilTest.

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 226 matching lines @@
             arc_session_manager()->state());
 
   pref->SetBoolean(prefs::kArcEnabled, false);
 
   ASSERT_TRUE(WaitForDataRemoved(ArcSessionManager::State::STOPPED));
 
   // Correctly stop service.
   arc_session_manager()->Shutdown();
 }
 
-TEST_F(ArcSessionManagerTest, DisabledForEphemeralDataUsers) {
-  PrefService* const prefs = profile()->GetPrefs();
-  EXPECT_FALSE(prefs->GetBoolean(prefs::kArcSignedIn));
-  prefs->SetBoolean(prefs::kArcEnabled, true);
-
-  chromeos::FakeChromeUserManager* const fake_user_manager =
-      GetFakeUserManager();
-
-  fake_user_manager->AddUser(fake_user_manager->GetGuestAccountId());
-  fake_user_manager->SwitchActiveUser(fake_user_manager->GetGuestAccountId());
-  arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
-  ASSERT_EQ(ArcSessionManager::State::NOT_INITIALIZED,
-            arc_session_manager()->state());
-
-  fake_user_manager->AddUser(user_manager::DemoAccountId());
-  fake_user_manager->SwitchActiveUser(user_manager::DemoAccountId());
-  arc_session_manager()->Shutdown();
-  arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
-  ASSERT_EQ(ArcSessionManager::State::NOT_INITIALIZED,
-            arc_session_manager()->state());
-
-  const AccountId public_account_id(
-      AccountId::FromUserEmail("public_user@gmail.com"));
-  fake_user_manager->AddPublicAccountUser(public_account_id);
-  fake_user_manager->SwitchActiveUser(public_account_id);
-  arc_session_manager()->Shutdown();
-  arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
-  ASSERT_EQ(ArcSessionManager::State::NOT_INITIALIZED,
-            arc_session_manager()->state());
-
-  const AccountId not_in_list_account_id(

[hidehiko, 2017/02/23 19:05:54]

Note: this case is redundant, because this is covered by "non-primary-user"
case. Thus, just removed.

-      AccountId::FromUserEmail("not_in_list_user@gmail.com"));
-  fake_user_manager->set_ephemeral_users_enabled(true);
-  fake_user_manager->AddUser(not_in_list_account_id);
-  fake_user_manager->SwitchActiveUser(not_in_list_account_id);
-  fake_user_manager->RemoveUserFromList(not_in_list_account_id);
-  arc_session_manager()->Shutdown();
-  arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
-  ASSERT_EQ(ArcSessionManager::State::NOT_INITIALIZED,
-            arc_session_manager()->state());
-
-  // Correctly stop service.
-  arc_session_manager()->Shutdown();
-}
-
 TEST_F(ArcSessionManagerTest, BaseWorkflow) {
   ASSERT_TRUE(arc_session_manager()->IsSessionStopped());
   ASSERT_EQ(ArcSessionManager::State::NOT_INITIALIZED,
             arc_session_manager()->state());
   EXPECT_TRUE(arc_session_manager()->sign_in_start_time().is_null());
   EXPECT_TRUE(arc_session_manager()->arc_start_time().is_null());
 
   arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
 
   // By default ARC is not enabled.
@@ skipping 532 matching lines @@
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   CloseLoginDisplayHost();
   ReportActorDestroyed();
   EXPECT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
   if (!IsManagedUser())
     EXPECT_FALSE(IsArcPlayStoreEnabledForProfile(profile()));
 }
 
 }  // namespace arc