Re-enabling MediaSessionVisibilityBrowserTests for debugging

content/browser/media/session/media_session_visibility_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 "base/command_line.h"
 #include "base/location.h"
+#include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/media/session/media_session.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/shell/browser/shell.h"
@@ skipping 85 matching lines @@
 
   void WaitForMediaSessionState(MediaSession::State state) {
     ASSERT_TRUE(media_session_state_loop_runners_.count(state));
     media_session_state_loop_runners_[state]->Run();
   }
 
  protected:
   void TestSessionInactiveWhenHiddenAfterContentPause() {
     LoadTestPage();
 
+    LOG(INFO) << "Starting player";
     ClearMediaSessionStateLoopRunners();
     RunScript(kStartPlayerScript);
+    LOG(INFO) << "Waiting for Session to be active";
     WaitForMediaSessionState(MediaSession::State::ACTIVE);
 
+    LOG(INFO) << "Pausing player";
     ClearMediaSessionStateLoopRunners();
     RunScript(kPausePlayerScript);
+    LOG(INFO) << "Waiting for Session to be suspended";
     WaitForMediaSessionState(MediaSession::State::SUSPENDED);
 
+    LOG(INFO) << "Hiding the tab";
     ClearMediaSessionStateLoopRunners();
     web_contents_->WasHidden();
+    LOG(INFO) << "Waiting for Session to be inactive";
     WaitForMediaSessionState(MediaSession::State::INACTIVE);
+
+    LOG(INFO) << "Test succeeded";
   }
 
   void TestSessionInactiveWhenHiddenWhilePlaying() {
     LoadTestPage();
 
+    LOG(INFO) << "Starting player";
     ClearMediaSessionStateLoopRunners();
     RunScript(kStartPlayerScript);
+    LOG(INFO) << "Waiting for Session to be active";
     WaitForMediaSessionState(MediaSession::State::ACTIVE);
 
+    LOG(INFO) << "Hiding the tab";
     ClearMediaSessionStateLoopRunners();
     web_contents_->WasHidden();
+    LOG(INFO) << "Waiting for Session to be inactive";
     WaitForMediaSessionState(MediaSession::State::INACTIVE);
+
+    LOG(INFO) << "Test succeeded";
   }
 
   void TestSessionSuspendedWhenHiddenAfterContentPause() {
     LoadTestPage();
 
+    LOG(INFO) << "Starting player";
     ClearMediaSessionStateLoopRunners();
     RunScript(kStartPlayerScript);
+    LOG(INFO) << "Waiting for Session to be active";
     WaitForMediaSessionState(MediaSession::State::ACTIVE);
 
+    LOG(INFO) << "Pausing player";
     ClearMediaSessionStateLoopRunners();
     RunScript(kPausePlayerScript);
+    LOG(INFO) << "Waiting for Session to be suspended";
     WaitForMediaSessionState(MediaSession::State::SUSPENDED);
 
+    LOG(INFO) << "Hiding the tab";
     // Wait for 1 second and check the MediaSession state.
     // No better solution till now.
     web_contents_->WasHidden();
     Wait(base::TimeDelta::FromSeconds(1));
     ASSERT_EQ(media_session_->audio_focus_state_,
               MediaSession::State::SUSPENDED);
+
+    LOG(INFO) << "Test succeeded";
   }
 
   void TestSessionActiveWhenHiddenWhilePlaying() {
     LoadTestPage();
 
+    LOG(INFO) << "Starting player";
     ClearMediaSessionStateLoopRunners();
     RunScript(kStartPlayerScript);
+    LOG(INFO) << "Waiting for Session to be active";
     WaitForMediaSessionState(MediaSession::State::ACTIVE);
 
+    LOG(INFO) << "Hiding the tab";
     // Wait for 1 second and check the MediaSession state.
     // No better solution till now.
     web_contents_->WasHidden();
     Wait(base::TimeDelta::FromSeconds(1));
     ASSERT_EQ(media_session_->audio_focus_state_,
               MediaSession::State::ACTIVE);
+
+    LOG(INFO) << "Test succeeded";
   }
 
   WebContents* web_contents_;
   MediaSession* media_session_;
   // MessageLoopRunners for waiting MediaSession state to change. Note that the
   // MessageLoopRunners can accept Quit() before calling Run(), thus the state
   // change can still be captured before waiting. For example, the MediaSession
   // might go active immediately after calling HTMLMediaElement.play(). A test
   // can listen to the state change before calling play(), and then wait for the
   // state change after play().
@@ skipping 54 matching lines @@
 #if defined(OS_ANDROID)
 // AndroidPipeline + SuspendOnHide
 class MediaSessionVisibilityBrowserTest_AndroidPipeline_SuspendOnHide :
       public MediaSessionVisibilityBrowserTest {
   void SetUpCommandLine(base::CommandLine* command_line) override {
     MediaSessionVisibilityBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kDisableUnifiedMediaPipeline);
   }
 };
 
-// Disabled pending crbug.com/619096.
-// INCLUDE_TEST_FROM_BASE_CLASS(
-//     MediaSessionVisibilityBrowserTest_AndroidPipeline_SuspendOnHide,
-//     TestSessionInactiveWhenHiddenAfterContentPause)
-// INCLUDE_TEST_FROM_BASE_CLASS(
-//     MediaSessionVisibilityBrowserTest_AndroidPipeline_SuspendOnHide,
-//     TestSessionInactiveWhenHiddenWhilePlaying)
+// The following tests are flaky. Re-enabling with logging to see what's
+// happening on the bots. See crbug.com/619096.
+INCLUDE_TEST_FROM_BASE_CLASS(
+    MediaSessionVisibilityBrowserTest_AndroidPipeline_SuspendOnHide,
+    TestSessionInactiveWhenHiddenAfterContentPause)
+INCLUDE_TEST_FROM_BASE_CLASS(
+    MediaSessionVisibilityBrowserTest_AndroidPipeline_SuspendOnHide,
+    TestSessionInactiveWhenHiddenWhilePlaying)
 
 // AndroidPipeline + NosuspendOnHide
 class MediaSessionVisibilityBrowserTest_AndroidPipeline_NosuspendOnHide :
       public MediaSessionVisibilityBrowserTest {
   void SetUpCommandLine(base::CommandLine* command_line) override {
     MediaSessionVisibilityBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kDisableUnifiedMediaPipeline);
     command_line->AppendSwitch(switches::kDisableMediaSuspend);
   }
 };
 
-// Disabled pending crbug.com/619096.
-// INCLUDE_TEST_FROM_BASE_CLASS(
-//     MediaSessionVisibilityBrowserTest_AndroidPipeline_NosuspendOnHide,
-//     TestSessionSuspendedWhenHiddenAfterContentPause)
-//INCLUDE_TEST_FROM_BASE_CLASS(
-//    MediaSessionVisibilityBrowserTest_AndroidPipeline_NosuspendOnHide,
-//    TestSessionActiveWhenHiddenWhilePlaying)
+// The following tests are flaky. Re-enabling with logging to see what's
+// happening on the bots. See crbug.com/619096.
+INCLUDE_TEST_FROM_BASE_CLASS(
+    MediaSessionVisibilityBrowserTest_AndroidPipeline_NosuspendOnHide,
+    TestSessionSuspendedWhenHiddenAfterContentPause)
+INCLUDE_TEST_FROM_BASE_CLASS(
+   MediaSessionVisibilityBrowserTest_AndroidPipeline_NosuspendOnHide,
+   TestSessionActiveWhenHiddenWhilePlaying)
 
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content