Move ArcSessionRunner from ArcBridgeService to ArcSessionManager.

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 136 matching lines @@
                                     url);
 
     // 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 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();
+    ArcSessionManager::Get()->SetArcSessionRunnerForTesting(
+        base::MakeUnique<ArcSessionRunner>(base::Bind(FakeArcSession::Create)));
 
     EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     // Create test profile.
     TestingProfile::Builder profile_builder;
     profile_builder.SetPath(temp_dir_.GetPath().AppendASCII("TestArcProfile"));
     profile_builder.SetProfileName(kFakeUserName);
     profile_builder.AddTestingFactory(
         ProfileOAuth2TokenServiceFactory::GetInstance(),
         BuildFakeProfileOAuth2TokenService);
@@ skipping 82 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