Clean up MediaSessionImpl state interfaces

content/browser/media/session/media_session_impl.cc

Index: content/browser/media/session/media_session_impl.cc
diff --git a/content/browser/media/session/media_session_impl.cc b/content/browser/media/session/media_session_impl.cc
index 66383fec7022724f87076e836e23c17ef08d1fc9..e2e554653b7c795504b18975930c0d1d8b468722 100644
--- a/content/browser/media/session/media_session_impl.cc
+++ b/content/browser/media/session/media_session_impl.cc
@@ -301,12 +301,12 @@ void MediaSessionImpl::OnPlayerPaused(MediaSessionPlayerObserver* observer,
   }
 
   // Otherwise, suspend the session.
-  DCHECK(!IsSuspended());
+  DCHECK(IsActive());
   OnSuspendInternal(SuspendType::CONTENT, State::SUSPENDED);
 }
 
 void MediaSessionImpl::Resume(SuspendType suspend_type) {
-  DCHECK(IsReallySuspended());
+  DCHECK(IsSuspended());
 
   // When the resume requests comes from another source than system, audio focus
   // must be requested.
@@ -326,7 +326,7 @@ void MediaSessionImpl::Resume(SuspendType suspend_type) {
 }
 
 void MediaSessionImpl::Suspend(SuspendType suspend_type) {
-  if (IsSuspended())
+  if (!IsActive())
     return;
 
   OnSuspendInternal(suspend_type, State::SUSPENDED);
@@ -381,13 +381,8 @@ bool MediaSessionImpl::IsActive() const {
   return audio_focus_state_ == State::ACTIVE;
 }
 
-bool MediaSessionImpl::IsReallySuspended() const {
-  return audio_focus_state_ == State::SUSPENDED;
-}
-
 bool MediaSessionImpl::IsSuspended() const {
-  // TODO(mlamouri): should be == State::SUSPENDED.
-  return audio_focus_state_ != State::ACTIVE;
+  return audio_focus_state_ == State::SUSPENDED;
 }
 
 bool MediaSessionImpl::IsControllable() const {
@@ -423,10 +418,6 @@ void MediaSessionImpl::SetDelegateForTests(
   delegate_ = std::move(delegate);
 }
 
-bool MediaSessionImpl::IsActiveForTest() const {
-  return audio_focus_state_ == State::ACTIVE;
-}
-
 MediaSessionUmaHelper* MediaSessionImpl::uma_helper_for_test() {
   return &uma_helper_;
 }