arc: Consolidate IsArcAllowedForUser logic

chrome/browser/chromeos/arc/arc_util.cc

 // Copyright 2017 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/chromeos/arc/arc_util.h"
 
 #include <linux/magic.h>
 #include <sys/statfs.h>
 
 #include "base/callback.h"
@@ skipping 110 matching lines @@
     VLOG(1) << "Supervised users are not supported in ARC.";
     return false;
   }
 
   // Play Store requires an appropriate application install mechanism. Normal
   // users do this through GAIA, but Kiosk and Active Directory users use
   // different application install mechanism. ARC is not allowed otherwise
   // (e.g. in public sessions). cf) crbug.com/605545
   const user_manager::User* user =
       chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
-  const bool has_gaia_account = user && user->HasGaiaAccount();
-  const bool is_arc_active_directory_user =
-      user && user->IsActiveDirectoryUser() &&
-      IsArcAllowedForActiveDirectoryUsers();
-  if (!has_gaia_account && !is_arc_active_directory_user && !IsArcKioskMode()) {
+  if (!IsArcAllowedForUser(user) && !IsArcKioskMode()) {
     VLOG(1) << "Users without GAIA accounts are not supported in ARC.";
     return false;
   }
 
   // Do not run ARC instance when supervised user is being created.
   // Otherwise noisy notification may be displayed.
   chromeos::UserFlow* user_flow =
       chromeos::ChromeUserManager::Get()->GetUserFlow(user->GetAccountId());
   if (!user_flow || !user_flow->CanStartArc()) {
     VLOG(1) << "ARC is not allowed in the current user flow.";
     return false;
   }
 
   // Do not allow for Ephemeral data user. cf) b/26402681
   if (user_manager::UserManager::Get()

[hidehiko, 2017/05/17 02:09:45]

Clarification: Can this be merged into IsArcAllowedForUser, too?

[xiyuan, 2017/05/17 21:36:14]

Done.

           ->IsCurrentUserCryptohomeDataEphemeral()) {
     VLOG(1) << "Users with ephemeral data are not supported in ARC.";
     return false;
   }
 
   return true;
 }
 
 bool IsArcCompatibleFileSystemUsedForProfile(const Profile* profile) {
   const user_manager::User* user =
@@ skipping 103 matching lines @@
   // Otherwise, check the underlying filesystem.
   base::PostTaskWithTraitsAndReplyWithResult(
       FROM_HERE,
       {base::MayBlock(), base::TaskPriority::USER_BLOCKING,
        base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
       base::Bind(&IsArcCompatibleFilesystem, profile_path),
       base::Bind(&StoreCompatibilityCheckResult, account_id, callback));
 }
 
 }  // namespace arc