| Index: chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
|
| index 3b25d7599398c1b8123c23a315cfe37e3bb09c92..a8549146768445d43d8b1fba22c84230bc0828cf 100644
|
| --- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
|
| @@ -518,8 +518,9 @@ const char kRandomPagePath[] = "/non_google_page";
|
| // merge session tests.
|
| class FakeGoogle {
|
| public:
|
| - FakeGoogle() : start_event_(true, false) {
|
| - }
|
| + FakeGoogle()
|
| + : start_event_(base::WaitableEvent::ResetPolicy::MANUAL,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED) {}
|
|
|
| ~FakeGoogle() {}
|
|
|
| @@ -583,9 +584,10 @@ class FakeGoogle {
|
| class DelayedFakeGaia : public FakeGaia {
|
| public:
|
| DelayedFakeGaia()
|
| - : blocking_event_(true, false),
|
| - start_event_(true, false) {
|
| - }
|
| + : blocking_event_(base::WaitableEvent::ResetPolicy::MANUAL,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED),
|
| + start_event_(base::WaitableEvent::ResetPolicy::MANUAL,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED) {}
|
|
|
| void UnblockMergeSession() {
|
| blocking_event_.Signal();
|
|
|