Fix Arc integration test.

chrome/browser/chromeos/arc/arc_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_UTIL_H_
 
 // Most utility should be put in components/arc/arc_util.{h,cc}, rather than
 // here. However, some utility implementation requires other modules defined in
 // chrome/, so this file contains such utilities.
 // Note that it is not allowed to have dependency from components/ to chrome/
 // by DEPS.
 
 class Profile;
 
 namespace arc {
 
+enum ArcAllowedForTestType {
+  ALLOWEDFORSYNCTEST,

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

style: In chrome, we concat capital letter words with underscores.
So, ALLOWED_FOR_SYNC_TEST, DISALLOWED_FOR_TEST etc.

+  DISALLOWEDFORTEST,
+  NOTSET,
+};
+
 // Returns true if ARC is allowed to run for the given profile.
 // Otherwise, returns false, e.g. if the Profile is not for the primary user,
 // ARC is not available on the device, it is in the flow to set up managed
 // account creation.
 // nullptr can be safely passed to this function. In that case, returns false.
 bool IsArcAllowedForProfile(const Profile* profile);
 
-// Disallows ARC for all profiles for testing.
+// 1.Type ALLOWEDFORSYNCTEST: Sets ARC as allowed for sync test.
+// In sync test, mutilpe ArcAppListPrefs are created and can confuse

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

nit: s/mutilpe/multiple/

+// ArcSessionManager. Let IsArcAllowedForProfile() simply return true to

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

This is not really true, IIUC. If IsArcAllowedForProfile() returns true for
multiple Profile, it conflicts with the ASM's assumption that ASM works only for
primary user Profile.

Could you fix the comment?

+// stop confusing ArcSessionManager.
+// 2.Type DISALLOWEDFORTEST: Disallows ARC for all profiles for testing.
 // In most cases, disabling ARC should be done via commandline. However,
 // there are some cases to be tested where ARC is available, but ARC is not
 // supported for some reasons (e.g. incognito mode, supervised user,
 // secondary profile). On the other hand, some test infra does not support
 // such situations (e.g. API test). This is for workaround to emulate the
 // case.
-void DisallowArcForTesting();
+// 3.Type NOTSET: Goes through regular checks.
+void SetArcAllowedForTesting(ArcAllowedForTestType type);

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

Could you use the signature:

void SetArcAllowedForTesting(bool allowed);

Then in .cc file, you can set global value.

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

Generally abandon modification for this file. Keep only Flag in
ArcAppListPrefsFactory for sync test.

 
 // Returns whether the user has opted in (or is opting in now) to use Google
 // Play Store on ARC.
 // This is almost equivalent to the value of "arc.enabled" preference. However,
 // in addition, if ARC is not allowed for the given |profile|, then returns
 // false. Please see detailed condition for the comment of
 // IsArcAllowedForProfile().
 // Note: For historical reason, the preference name is not matched with the
 // actual meaning.
 bool IsArcPlayStoreEnabledForProfile(const Profile* profile);
@@ skipping 10 matching lines @@
 // It is requirement for a caller to ensure ARC is allowed for the user of
 // the given |profile|.
 // TODO(hidehiko): De-couple the concept to enable ARC system and opt-in
 // to use Google Play Store. Note that there is a plan to use ARC without
 // Google Play Store, then ARC can run without opt-in.
 void SetArcPlayStoreEnabledForProfile(Profile* profile, bool enabled);
 
 }  // namespace arc
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ARC_UTIL_H_