Migrate --enable-arc and --arc-available part 1.

chrome/browser/chromeos/extensions/info_private_apitest.cc

 // Copyright (c) 2011 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 "base/values.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "components/arc/arc_util.h"
 #include "components/prefs/pref_service.h"
 
 namespace {
 
 const char kTestAppId[] = "ljoammodoonkhnehlncldjelhidljdpi";
 
 }  // namespace
 
 class ChromeOSInfoPrivateTest : public ExtensionApiTest {
  public:
   ChromeOSInfoPrivateTest() {}
   ~ChromeOSInfoPrivateTest() override {}
 
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    ExtensionApiTest::SetUpCommandLine(command_line);
+    // Make ARC enabled for ArcAvailable/ArcEnabled tests.
+    arc::SetArcAvailableCommandLineForTesting(command_line);
+  }
+
  protected:
   void EnableKioskSession() {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kForceAppMode);
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kAppId,
                                                               kTestAppId);
   }
-
-  void MakeArcAvailable() {
-    base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        chromeos::switches::kArcAvailable);
-  }
-
-  void EnableArc() {
-    base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        chromeos::switches::kEnableArc);
-  }
 };
 
 IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, TestGetAndSet) {
   // Set the initial timezone different from what JS function
   // timezoneSetTest() will attempt to set.
   base::StringValue initial_timezone("America/Los_Angeles");
   chromeos::CrosSettings::Get()->Set(chromeos::kSystemTimezone,
                                      initial_timezone);
 
   // Check that accessibility settings are set to default values.
@@ skipping 24 matching lines @@
 
 // TODO(steel): Investigate merging the following tests.
 
 IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, Kiosk) {
   EnableKioskSession();
   ASSERT_TRUE(
       RunPlatformAppTestWithArg("chromeos_info_private/extended", "kiosk"))
       << message_;
 }
 
+IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, ArcEnabled) {

[Rahul Chaturvedi, 2017/01/26 06:31:22]

I hate to nit-pick, but these tests will now always pass since we always enable
ARC++ as part of the test setup. Ideally we also want to test the situation
where ARC++ is *not* enabled. Earlier that was not getting tested but by adding
a simple check to the kiosk test above, or introducing a small test, we could
test it.

This functionality has broken before, hence my reluctance to let this go without
every single test case being tested. We minimum we need to test for,
ARC++ not enabled
ARC++ enabled, but not available
ARC++ available

I understand that the first of these tests did not exist to start; but this
would be a good time to add it :)

[hidehiko, 2017/01/26 06:51:07]

Sure, done.
Instead of "not enabled", I named "not available" after the actual value ;-).

+  ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended",
+                                        "arc enabled"))
+      << message_;
+}
+
 IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, ArcAvailable) {
-  MakeArcAvailable();
+  // Even if ARC is available, ARC may not be able to be enabled. (Please
+  // see ArcSessionManager::IsAllowedForProfile() for details).
+  // In such cases, we expect "available". However, current testing framework
+  // does not seem to run with such cases, unfortunately. So, here directly
+  // control the function.
+  arc::ArcSessionManager::DisallowForTesting();
   ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended",
                                         "arc available"))
       << message_;
 }
-
-IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, ArcEnabled) {
-  EnableArc();
-  ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended",
-                                        "arc enabled"))
-      << message_;
-}