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/prefs/pref_service.h"
 
 namespace {
 
 const char kTestAppId[] = "ljoammodoonkhnehlncldjelhidljdpi";
 
 }  // namespace
 
 class ChromeOSInfoPrivateTest : public ExtensionApiTest {
  public:
   ChromeOSInfoPrivateTest() {}
   ~ChromeOSInfoPrivateTest() override {}
 
  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() {
+    // TODO(hidehiko): Introduce a utility to let IsArcAvailable() return true

[hidehiko, 2017/01/24 10:57:36]

Note: As many other tests do something similar to this, let me work on this in a
following CL.

+    // for testing.
     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,
@@ skipping 27 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, ArcAvailable) {

[Luis Héctor Chávez, 2017/01/24 17:00:37]

This name is confusing. Can you change it to ArcAvailableDisallowed?

[hidehiko, 2017/01/24 18:05:56]

Done.

   MakeArcAvailable();
+  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"))

[xiyuan, 2017/01/24 17:52:38]

Is this test case no longer needed? If so, also update
chromeos_info_private/extended/background.js.

[hidehiko, 2017/01/24 18:05:56]

Good catch. Done.

-      << message_;
-}