Android MediaSession: do not resume a UI suspended session on a system resume.

content/browser/media/android/media_session_browsertest.cc

Index: content/browser/media/android/media_session_browsertest.cc
diff --git a/content/browser/media/android/media_session_browsertest.cc b/content/browser/media/android/media_session_browsertest.cc
index 9707330afec853a1a947286fa2b5e678c57a7707..bae72943390bba6f8118d7cb7784a969d8939bab 100644
--- a/content/browser/media/android/media_session_browsertest.cc
+++ b/content/browser/media/android/media_session_browsertest.cc
@@ -154,9 +154,13 @@ class MediaSessionBrowserTest : public content::ContentBrowserTest {
 
   bool IsSuspended() { return media_session_->IsSuspended(); }
 
-  void ResumeSession() { media_session_->Resume(); }
+  void ResumeSession(content::MediaSession::SuspendType type) {
+    media_session_->Resume(type);
+  }
 
-  void SuspendSession() { media_session_->Suspend(); }
+  void SuspendSession(content::MediaSession::SuspendType type) {
+    media_session_->Suspend(type);
+  }
 
   MockWebContentsObserver* mock_web_contents_observer() {
     return mock_web_contents_observer_.get();
@@ -753,7 +757,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
       new MockMediaSessionObserver);
 
   StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
-  SuspendSession();
+  SuspendSession(content::MediaSession::SuspendType::UI);
 
   EXPECT_TRUE(IsControllable());
   EXPECT_TRUE(IsSuspended());
@@ -768,8 +772,32 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
       new MockMediaSessionObserver);
 
   StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
-  SuspendSession();
-  ResumeSession();
+  SuspendSession(content::MediaSession::SuspendType::UI);
+  ResumeSession(content::MediaSession::SuspendType::UI);
+
+  EXPECT_TRUE(IsControllable());
+  EXPECT_FALSE(IsSuspended());
+}
+
+IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+                       DontResumeBySystemUISuspendedSessions) {
+  scoped_ptr<MockMediaSessionObserver> media_session_observer(
+      new MockMediaSessionObserver);
+  StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+  SuspendSession(content::MediaSession::SuspendType::UI);
+  ResumeSession(content::MediaSession::SuspendType::System);
+
+  EXPECT_TRUE(IsControllable());
+  EXPECT_TRUE(IsSuspended());
+}
+
+IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+                       AllowUIResumeForSystemSuspend) {
+  scoped_ptr<MockMediaSessionObserver> media_session_observer(
+      new MockMediaSessionObserver);
+  StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+  SuspendSession(content::MediaSession::SuspendType::System);
+  ResumeSession(content::MediaSession::SuspendType::UI);
 
   EXPECT_TRUE(IsControllable());
   EXPECT_FALSE(IsSuspended());

[whywhat, 2015/07/21 19:21:28]

Add a test that checks that Suspend(System) and Resume(System) works as
intended.