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

content/browser/media/android/media_session_browsertest.cc

 // Copyright 2015 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 "content/browser/media/android/media_session.h"
 
 #include <list>
 #include <vector>
 
 #include "content/browser/media/android/media_session_observer.h"
@@ skipping 136 matching lines @@
   bool HasAudioFocus() { return media_session_->IsActiveForTest(); }
 
   MediaSession::Type GetSessionType() {
     return media_session_->audio_focus_type_for_test();
   }
 
   bool IsControllable() { return media_session_->IsControllable(); }
 
   bool IsSuspended() { return media_session_->IsSuspended(); }
 
-  void ResumeSession() { media_session_->Resume(); }
+  void UIResume() {
+    media_session_->OnResumeInternal(content::MediaSession::SuspendType::UI);
+  }
 
-  void SuspendSession() { media_session_->Suspend(); }
+  void SystemResume() {
+    media_session_->OnResumeInternal(
+        content::MediaSession::SuspendType::SYSTEM);
+  }
+
+  void UISuspend() {
+    media_session_->OnSuspendInternal(content::MediaSession::SuspendType::UI);
+  }
+
+  void SystemSuspend() {
+    media_session_->OnSuspendInternal(
+        content::MediaSession::SuspendType::SYSTEM);
+  }
 
   MockWebContentsObserver* mock_web_contents_observer() {
     return mock_web_contents_observer_.get();
   }
 
  protected:
   MediaSession* media_session_;
   scoped_ptr<MockWebContentsObserver> mock_web_contents_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSessionBrowserTest);
@@ skipping 576 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
                        ControlsNotUpdatedDueToResumeSessionAction) {
   EXPECT_CALL(*mock_web_contents_observer(),
               MediaSessionStateChanged(true, false));
 
   scoped_ptr<MockMediaSessionObserver> media_session_observer(
       new MockMediaSessionObserver);
 
   StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
-  SuspendSession();
+  UISuspend();
 
   EXPECT_TRUE(IsControllable());
   EXPECT_TRUE(IsSuspended());
 }
 
 IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
                        ControlsNotUpdatedDueToSuspendSessionAction) {
   EXPECT_CALL(*mock_web_contents_observer(),
               MediaSessionStateChanged(true, false));
 
   scoped_ptr<MockMediaSessionObserver> media_session_observer(
       new MockMediaSessionObserver);
 
   StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
-  SuspendSession();
-  ResumeSession();
+  UISuspend();
+  UIResume();
 
   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);
+
+  UISuspend();
+  EXPECT_TRUE(IsControllable());
+  EXPECT_TRUE(IsSuspended());
+
+  SystemResume();
+  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);
+
+  SystemSuspend();
+  EXPECT_TRUE(IsControllable());
+  EXPECT_TRUE(IsSuspended());
+
+  UIResume();
+  EXPECT_TRUE(IsControllable());
+  EXPECT_FALSE(IsSuspended());
+}
+
+IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeSuspendFromUI) {
+  scoped_ptr<MockMediaSessionObserver> media_session_observer(
+      new MockMediaSessionObserver);
+  StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+
+  UISuspend();
+  EXPECT_TRUE(IsControllable());
+  EXPECT_TRUE(IsSuspended());
+
+  UIResume();
+  EXPECT_TRUE(IsControllable());
+  EXPECT_FALSE(IsSuspended());
+}
+
+IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeSuspendFromSystem) {
+  scoped_ptr<MockMediaSessionObserver> media_session_observer(
+      new MockMediaSessionObserver);
+  StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+
+  SystemSuspend();
+  EXPECT_TRUE(IsControllable());
+  EXPECT_TRUE(IsSuspended());
+
+  SystemResume();
+  EXPECT_TRUE(IsControllable());
+  EXPECT_FALSE(IsSuspended());
+}