Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2917)

Unified Diff: chrome/browser/chromeos/arc/arc_session_manager_unittest.cc

Issue 2691213002: Move gtest param interface to the necessary class. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698