Split MediaSessionStateChanged() and MediaSessionMetadataChanged()

content/browser/media/session/media_session.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/session/media_session.h"
 
 #include "content/browser/media/session/media_session_delegate.h"
 #include "content/browser/media/session/media_session_observer.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 57 matching lines @@
   // with AudioFocusManager out to a seperate class. The AudioFocusManager unit
   // tests then could mock the interface and abandon audio focus when
   // WebContents is destroyed. See https://crbug.com/651069
   players_.clear();
   pepper_players_.clear();
   AbandonSystemAudioFocusIfNeeded();
 }
 
 void MediaSession::SetMetadata(const base::Optional<MediaMetadata>& metadata) {
   metadata_ = metadata;
-  // TODO(zqzhang): On Android, the metadata is sent though JNI everytime the
-  // media session play/pause state changes. Need to find a way to seprate the
-  // state change and Metadata update. See https://crbug.com/621855.
-  static_cast<WebContentsImpl*>(web_contents())->OnMediaSessionStateChanged();
+  static_cast<WebContentsImpl*>(web_contents())
+      ->OnMediaSessionMetadataChanged();
 }
 
 bool MediaSession::AddPlayer(MediaSessionObserver* observer,
                              int player_id,
                              media::MediaContentType media_content_type) {
   if (media_content_type == media::MediaContentType::Pepper)
     return AddPepperPlayer(observer, player_id);
 
   observer->OnSetVolumeMultiplier(player_id, GetVolumeMultiplier());
 
@@ skipping 343 matching lines @@
   DCHECK(success);
 
   pepper_players_.insert(PlayerIdentifier(observer, player_id));
 
   observer->OnSetVolumeMultiplier(player_id, GetVolumeMultiplier());
 
   return true;
 }
 
 }  // namespace content