Fix Arc integration test.

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 "base/logging.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/arc/arc_util.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 
 namespace arc {
 
 namespace {

[lgcheng, 2017/02/25 01:40:38]

Comments for type are in util.h.

-
-// Let IsAllowedForProfile() return "false" for any profile.
-bool g_disallow_for_testing = false;
-
+ArcAllowedForTestType g_arc_allowed_for_test_type = NOTSET;
 }  // namespace
 
 bool IsArcAllowedForProfile(const Profile* profile) {
-  if (g_disallow_for_testing) {
-    VLOG(1) << "ARC is disallowed for testing.";
-    return false;
+  switch (g_arc_allowed_for_test_type) {
+    case ALLOWEDFORSYNCTEST:
+      return true;
+    case DISALLOWEDFORTEST:
+      return false;
+    // Goes through regular checks.
+    case NOTSET:
+    default:

[hidehiko, 2017/03/02 17:45:39]

No default section please.
cf) arc++chromium-style guide.

[lgcheng, 2017/03/02 23:45:10]

Modification for this file is abandoned.

+      break;
   }
 
   // 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.";
     return false;
   }
 
@@ skipping 46 matching lines @@
   // 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;
   }
 
   return true;
 }
 
-void DisallowArcForTesting() {
-  g_disallow_for_testing = true;
+void SetArcAllowedForTesting(ArcAllowedForTestType type) {
+  g_arc_allowed_for_test_type = type;
 }
 
 bool IsArcPlayStoreEnabledForProfile(const Profile* profile) {
   return IsArcAllowedForProfile(profile) &&
          profile->GetPrefs()->GetBoolean(prefs::kArcEnabled);
 }
 
 bool IsArcPlayStoreEnabledPreferenceManagedForProfile(const Profile* profile) {
   if (!IsArcAllowedForProfile(profile)) {
     LOG(DFATAL) << "ARC is not allowed for profile";
     return false;
   }
   return profile->GetPrefs()->IsManagedPreference(prefs::kArcEnabled);
 }
 
 void SetArcPlayStoreEnabledForProfile(Profile* profile, bool enabled) {
   DCHECK(IsArcAllowedForProfile(profile));
   if (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile)) {
     VLOG(1) << "Do nothing, since the Google-Play-Store-enabled pref is "
             << "managed.";
     return;
   }
   profile->GetPrefs()->SetBoolean(prefs::kArcEnabled, enabled);
 }
 
 }  // namespace arc