arc: Add IsArcAllowedInAppListForProfile.

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/files/file_path.h"
@@ skipping 17 matching lines @@
 
 constexpr char kLsbReleaseArcVersionKey[] = "CHROMEOS_ARC_ANDROID_SDK_VERSION";
 constexpr char kAndroidMSdkVersion[] = "23";
 
 // Let IsAllowedForProfile() return "false" for any profile.
 bool g_disallow_for_testing = false;
 
 }  // namespace
 
 bool IsArcAllowedForProfile(const Profile* profile) {
+  if (!IsArcAllowedInAppListForProfile(profile))
+    return false;
+
+  if (base::SysInfo::IsRunningOnChromeOS()) {
+    // Do not allow newer version of ARC on old filesystem.
+    // Check this condition only on real Chrome OS devices. Test runs on Linux
+    // workstation does not have expected /etc/lsb-release field nor profile
+    // creation step.
+    if (!IsProfileVerifiedToBeOnArcCompatibleFilesystem(profile))
+      return false;
+  }
+
+  return true;
+}
+
+bool IsArcAllowedInAppListForProfile(const Profile* profile) {
   if (g_disallow_for_testing) {
     VLOG(1) << "ARC is disallowed for testing.";
     return false;
   }
 
   // ARC Kiosk can be enabled even if ARC is not yet supported on the device.
   // In that case IsArcKioskMode() should return true as profile is already
   // created.
   if (!IsArcAvailable() && !(IsArcKioskMode() && IsArcKioskAvailable())) {
     VLOG(1) << "ARC is not available.";
@@ skipping 46 matching lines @@
     return false;
   }
 
   // Do not allow for Ephemeral data user. cf) b/26402681
   if (user_manager::UserManager::Get()
           ->IsCurrentUserCryptohomeDataEphemeral()) {
     VLOG(1) << "Users with ephemeral data are not supported in ARC.";
     return false;
   }
 
-  // Do not allow newer version of ARC on old filesystem.
-  // Check this condition only on real Chrome OS devices. Test runs on Linux
-  // workstation does not have expected /etc/lsb-release field nor profile
-  // creation step.
-  if (base::SysInfo::IsRunningOnChromeOS()) {
-    // chromeos::UserSessionManager::PrepareProfile does the actual file system
-    // check and stores the result to prefs, so that it survives crash-restart.
-    const bool is_filesystem_compatible =
-        profile->GetPrefs()->GetBoolean(prefs::kArcCompatibleFilesystemChosen);
-    std::string arc_sdk_version;
-    const bool is_M = base::SysInfo::GetLsbReleaseValue(
-                          kLsbReleaseArcVersionKey, &arc_sdk_version) &&
-                      arc_sdk_version == kAndroidMSdkVersion;
-    // To run ARC we want to make sure either
-    // - Underlying file system is compatible with ARC, or
-    // - SDK version is M.
-    if (!is_filesystem_compatible && !is_M) {
-      VLOG(1)
-          << "Users with SDK version (" << arc_sdk_version
-          << ") are not supported when they postponed to migrate to dircrypto.";
-      return false;
-    }
+  return true;
+}
+
+bool IsProfileVerifiedToBeOnArcCompatibleFilesystem(const Profile* profile) {
+  // chromeos::UserSessionManager::PrepareProfile does the actual file system
+  // check and stores the result to prefs, so that it survives crash-restart.
+  const bool is_filesystem_compatible =
+      profile->GetPrefs()->GetBoolean(prefs::kArcCompatibleFilesystemChosen);
+  std::string arc_sdk_version;
+  const bool is_M = base::SysInfo::GetLsbReleaseValue(kLsbReleaseArcVersionKey,
+                                                      &arc_sdk_version) &&
+                    arc_sdk_version == kAndroidMSdkVersion;
+
+  // To run ARC we want to make sure either
+  // - Underlying file system is compatible with ARC, or
+  // - SDK version is M.
+  if (!is_filesystem_compatible && !is_M) {
+    VLOG(1)
+        << "Users with SDK version (" << arc_sdk_version
+        << ") are not supported when they postponed to migrate to dircrypto.";
+    return false;
   }
 
   return true;
 }
 
 void DisallowArcForTesting() {
   g_disallow_for_testing = true;
 }
 
 bool IsArcPlayStoreEnabledForProfile(const Profile* profile) {
@@ skipping 42 matching lines @@
   base::ThreadRestrictions::AssertIOAllowed();
 
   // If it can be verified it is not on ecryptfs, then it is ok.
   struct statfs statfs_buf;
   if (statfs(path.value().c_str(), &statfs_buf) < 0)
     return false;
   return statfs_buf.f_type != ECRYPTFS_SUPER_MAGIC;
 }
 
 }  // namespace arc