Move gtest param interface to the necessary class.

chrome/browser/chromeos/arc/arc_session_manager_unittest.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 <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 94 matching lines @@
                       bool is_auto_launch) override {}
   void StartDemoAppLaunch() override {}
   void StartArcKiosk(const AccountId& account_id) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeLoginDisplayHost);
 };
 
 }  // namespace
 
-// Bool parameter is used to implement ArcSessionOobeOptInTest tests for
-// managed/unmanaged users. To prevent ambiguous testing::Test inheritance
-// implement derivation here, in base class.
-class ArcSessionManagerTestBase : public testing::TestWithParam<bool> {
+class ArcSessionManagerTestBase : public testing::Test {
  public:
   ArcSessionManagerTestBase()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         user_manager_enabler_(new chromeos::FakeChromeUserManager()) {}
   ~ArcSessionManagerTestBase() override = default;
 
   void SetUp() override {
     chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
         base::MakeUnique<chromeos::FakeSessionManagerClient>());
 
@@ skipping 511 matching lines @@
   CloseLoginDisplayHost();
   EXPECT_FALSE(ArcSessionManager::IsOobeOptInActive());
   GetFakeUserManager()->set_current_user_new(true);
   EXPECT_FALSE(ArcSessionManager::IsOobeOptInActive());
   CreateLoginDisplayHost();
   EXPECT_TRUE(ArcSessionManager::IsOobeOptInActive());
 }
 
 class ArcSessionOobeOptInNegotiatorTest
     : public ArcSessionOobeOptInTest,
-      public chromeos::ArcTermsOfServiceScreenActor {
+      public chromeos::ArcTermsOfServiceScreenActor,
+      public testing::WithParamInterface<bool> {
  public:
   ArcSessionOobeOptInNegotiatorTest() = default;
 
   void SetUp() override {
     ArcSessionOobeOptInTest::SetUp();
 
     AppendEnableArcOOBEOptInSwitch();
 
     ArcTermsOfServiceOobeNegotiator::SetArcTermsOfServiceScreenActorForTesting(
         this);
@@ skipping 113 matching lines @@
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   CloseLoginDisplayHost();
   ReportActorDestroyed();
   EXPECT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
   EXPECT_FALSE(!IsManagedUser() && arc_session_manager()->IsArcEnabled());
 }
 
 }  // namespace arc