Refactor ArcSessionRunner part 1.

chrome/browser/chromeos/arc/arc_session_manager_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 <memory>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
-#include "components/arc/arc_bridge_service_impl.h"
 #include "components/arc/arc_service_manager.h"
+#include "components/arc/arc_session_runner.h"
 #include "components/arc/test/fake_arc_session.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #include "components/policy/core/common/policy_switches.h"
 #include "components/prefs/pref_member.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/user_manager/user_manager.h"
@@ skipping 100 matching lines @@
 
     // Enable ARC.
     command_line->AppendSwitch(chromeos::switches::kEnableArc);
     chromeos::FakeSessionManagerClient* const fake_session_manager_client =
         new chromeos::FakeSessionManagerClient;
     fake_session_manager_client->set_arc_available(true);
     chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
         std::unique_ptr<chromeos::SessionManagerClient>(
             fake_session_manager_client));
 
-    // Mock out ARC bridge.
-    // Here inject FakeArcSession so blocking task runner is not needed.
-    auto service = base::MakeUnique<ArcBridgeServiceImpl>(nullptr);
-    service->SetArcSessionFactoryForTesting(base::Bind(FakeArcSession::Create));
-    ArcServiceManager::SetArcBridgeServiceForTesting(std::move(service));
+    // Mock out ARC instance.
+    ArcServiceManager::SetArcSessionRunnerForTesting(
+        base::MakeUnique<ArcSessionRunner>(base::Bind(FakeArcSession::Create)));
   }
 
   void SetUpOnMainThread() override {
     user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
         new chromeos::FakeChromeUserManager));
     // Init ArcSessionManager for testing.
     ArcSessionManager::DisableUIForTesting();
     ArcSessionManager::EnableCheckAndroidManagementForTesting();
 
     EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ skipping 90 matching lines @@
                                                    base::Time::Max());
   ArcSessionManagerShutdownObserver().Wait();
   ASSERT_EQ(ArcSessionManager::State::REMOVING_DATA_DIR,
             ArcSessionManager::Get()->state());
   ArcSessionManagerDataRemovedObserver().Wait();
   ASSERT_EQ(ArcSessionManager::State::STOPPED,
             ArcSessionManager::Get()->state());
 }
 
 }  // namespace arc