Index: chrome/browser/chromeos/arc/arc_session_manager_unittest.cc |
diff --git a/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc b/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc |
index 23bfe6d9d8986fd7b9789010d37c3a567f425683..b3ade1674ee9561274175eac31d0256ab8a2e8bd 100644 |
--- a/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc |
+++ b/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc |
@@ -112,10 +112,7 @@ class FakeLoginDisplayHost : public chromeos::LoginDisplayHost { |
} // 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), |
@@ -647,7 +644,8 @@ TEST_F(ArcSessionOobeOptInTest, OobeOptInActive) { |
class ArcSessionOobeOptInNegotiatorTest |
: public ArcSessionOobeOptInTest, |
- public chromeos::ArcTermsOfServiceScreenActor { |
+ public chromeos::ArcTermsOfServiceScreenActor, |
+ public testing::WithParamInterface<bool> { |
public: |
ArcSessionOobeOptInNegotiatorTest() = default; |