More graceful shutdown for ArcSession.

chrome/browser/chromeos/arc/arc_auth_service_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 121 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.
-    auto service = base::MakeUnique<ArcBridgeServiceImpl>();
+    // 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));
   }
 
   void SetUpOnMainThread() override {
     user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
         new chromeos::FakeChromeUserManager));
     // Init ArcAuthService for testing.
     ArcAuthService::DisableUIForTesting();
     ArcAuthService::EnableCheckAndroidManagementForTesting();
@@ skipping 91 matching lines @@
 
   prefs->SetBoolean(prefs::kArcEnabled, true);
   token_service()->IssueTokenForAllPendingRequests(kManagedAuthToken,
                                                    base::Time::Max());
   ArcAuthServiceShutdownObserver observer;
   observer.Wait();
   ASSERT_EQ(ArcAuthService::State::STOPPED, ArcAuthService::Get()->state());
 }
 
 }  // namespace arc