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

chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc

 // Copyright 2016 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/ui/app_list/arc/arc_app_dialog.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chromeos/chromeos_switches.h"
+#include "components/arc/arc_util.h"
 #include "components/arc/common/app.mojom.h"
 #include "components/arc/test/fake_app_instance.h"
 #include "content/public/test/test_utils.h"
 
 namespace arc {
 
 class ArcAppUninstallDialogViewBrowserTest : public InProcessBrowserTest {
  public:
   ArcAppUninstallDialogViewBrowserTest() {}
 
   // InProcessBrowserTest:
   ~ArcAppUninstallDialogViewBrowserTest() override {}
 
-  void SetUpAppInstance() {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    InProcessBrowserTest::SetUpCommandLine(command_line);
+    arc::SetArcAvailableCommandLineForTesting(command_line);
+  }
+
+  void SetUpInProcessBrowserTestFixture() override {
+    InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
+    ArcSessionManager::DisableUIForTesting();
+  }
+
+  void SetUpOnMainThread() override {
+    InProcessBrowserTest::SetUpOnMainThread();
     profile_ = browser()->profile();
-
-    base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        chromeos::switches::kEnableArc);
-
     arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
     if (!arc_app_list_pref_) {
       ArcAppListPrefsFactory::GetInstance()->RecreateServiceInstanceForTesting(
           profile_);
     }
 
     ArcSessionManager* session_manager = ArcSessionManager::Get();
     DCHECK(session_manager);
-    ArcSessionManager::DisableUIForTesting();
-    session_manager->OnPrimaryUserProfilePrepared(profile_);

[msw, 2017/01/26 18:22:44]

q: just checking, is this not needed anymore?

     session_manager->EnableArc();
 
     arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
     DCHECK(arc_app_list_pref_);
 
     base::RunLoop run_loop;
     arc_app_list_pref_->SetDefaltAppsReadyCallback(run_loop.QuitClosure());
     run_loop.Run();
 
     app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
@@ skipping 43 matching lines @@
   std::unique_ptr<arc::FakeAppInstance> app_instance_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAppUninstallDialogViewBrowserTest);
 };
 
 // User confirms/cancels Arc app uninstall. Note that the shortcut is removed
 // when the app and the package are uninstalled since the shortcut and the app
 // share same package.
 IN_PROC_BROWSER_TEST_F(ArcAppUninstallDialogViewBrowserTest,
                        UserConfirmsUninstall) {
-  SetUpAppInstance();
-
   std::vector<std::string> app_ids = arc_app_list_pref()->GetAppIds();
   EXPECT_EQ(app_ids.size(), 2u);
   std::string package_name = base::StringPrintf("fake.package.%d", 0);
   std::string app_activity = base::StringPrintf("fake.app.%d.activity", 0);
   std::string app_id =
       arc_app_list_pref()->GetAppId(package_name, app_activity);
 
   AppListService* service = AppListService::Get();
   ASSERT_TRUE(service);
   service->ShowForProfile(browser()->profile());
@@ skipping 14 matching lines @@
   content::RunAllPendingInMessageLoop();
   app_ids = arc_app_list_pref()->GetAppIds();
   EXPECT_EQ(app_ids.size(), 0u);
   controller->DismissView();
 }
 
 // User confirms/cancels Arc app shortcut removal. Note that the app is not
 // uninstalled when the shortcut is removed.
 IN_PROC_BROWSER_TEST_F(ArcAppUninstallDialogViewBrowserTest,
                        UserConfirmsUninstallShortcut) {
-  SetUpAppInstance();
-
   std::vector<std::string> app_ids = arc_app_list_pref()->GetAppIds();
   EXPECT_EQ(app_ids.size(), 2u);
   std::string package_name = base::StringPrintf("fake.package.%d", 0);
   std::string intent_uri = base::StringPrintf("Fake Shortcut uri %d", 0);
   std::string app_id = arc_app_list_pref()->GetAppId(package_name, intent_uri);
 
   AppListService* service = AppListService::Get();
   ASSERT_TRUE(service);
   service->ShowForProfile(browser()->profile());
   AppListControllerDelegate* controller(service->GetControllerDelegate());
@@ skipping 10 matching lines @@
   content::RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(CloseAppDialogViewAndConfirmForTest(true));
   content::RunAllPendingInMessageLoop();
   app_ids = arc_app_list_pref()->GetAppIds();
   EXPECT_EQ(app_ids.size(), 1u);
   controller->DismissView();
 }
 
 }  // namespace arc