Fix ArcBridgeBootstrap race issues.

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 14 matching lines @@
 #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/test/fake_arc_bridge_bootstrap.h"
-#include "components/arc/test/fake_arc_bridge_instance.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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace {
@@ skipping 58 matching lines @@
   void OnShutdownBridge() override {
     if (!run_loop_)
       return;
     run_loop_->Quit();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceShutdownObserver);
 };
 
-class ArcAuthServiceTest : public InProcessBrowserTest {
+class ArcAuthServiceTest : public InProcessBrowserTest,
+                           public ArcBridgeServiceImpl::Delegate {
  protected:
   ArcAuthServiceTest() {}
 
   // InProcessBrowserTest:
   ~ArcAuthServiceTest() override {}
 
   void SetUpInProcessBrowserTestFixture() override {
     // Start test device management server.
     test_server_.reset(new policy::LocalPolicyTestServer());
     ASSERT_TRUE(test_server_->Start());
 
     // Specify device management server URL.
     std::string url = test_server_->GetServiceURL().spec();
     base::CommandLine* const command_line =
         base::CommandLine::ForCurrentProcess();
     command_line->AppendSwitchASCII(policy::switches::kDeviceManagementUrl,
                                     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 bridge.
-    fake_arc_bridge_instance_.reset(new FakeArcBridgeInstance);
-    ArcServiceManager::SetArcBridgeServiceForTesting(
-        base::MakeUnique<ArcBridgeServiceImpl>(base::WrapUnique(
-            new FakeArcBridgeBootstrap(fake_arc_bridge_instance_.get()))));
+    std::unique_ptr<ArcBridgeServiceImpl> service(new ArcBridgeServiceImpl);
+    service->SetDelegateForTesting(this);
+    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();
 
     EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ skipping 41 matching lines @@
 
   void set_profile_name(const std::string& username) {
     profile_->set_profile_name(username);
   }
 
   Profile* profile() { return profile_.get(); }
 
   FakeProfileOAuth2TokenService* token_service() { return token_service_; }
 
  private:
+  // ArcBridgeServiceImpl::Delegate override:
+  std::unique_ptr<ArcBridgeBootstrap> CreateBootstrap() override {
+    return base::WrapUnique(new FakeArcBridgeBootstrap);

[Luis Héctor Chávez, 2016/09/07 23:38:32]

prefer base::MakeUnique<FakeArcBridgeBootstrap>(). Same in all other places you
build one of these objects.

[hidehiko, 2016/09/08 16:53:41]

Acknowledged.

+  }
+
   std::unique_ptr<policy::LocalPolicyTestServer> test_server_;
-  std::unique_ptr<FakeArcBridgeInstance> fake_arc_bridge_instance_;
   std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
   base::ScopedTempDir temp_dir_;
   std::unique_ptr<TestingProfile> profile_;
   FakeProfileOAuth2TokenService* token_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ArcAuthServiceTest, ConsumerAccount) {
   PrefService* const prefs = profile()->GetPrefs();
@@ skipping 27 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