Abort MSP::OnPrefetchDone() if just after MSP::Release(). Let seek and config change survive.

content/browser/media/android/browser_media_player_manager.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 82 matching lines @@
   virtual void OnKeyAdded(int media_keys_id,
                           const std::string& session_id) OVERRIDE;
   virtual void OnKeyError(int media_keys_id,
                           const std::string& session_id,
                           media::MediaKeys::KeyError error_code,
                           int system_code) OVERRIDE;
   virtual void OnKeyMessage(int media_keys_id,
                             const std::string& session_id,
                             const std::vector<uint8>& message,
                             const std::string& destination_url) OVERRIDE;
+  virtual void OnMediaDecoderCallback() OVERRIDE {}

[qinmin, 2013/10/29 23:49:34]

For test functions, normally use names like "OnMediaDecoderCallbackForTesting()"

[wolenetz, 2013/10/30 00:06:45]

Done. Note that there is now an associated presubmit warning for the call to
this from production code (in media_source_player.cc:560):
"You might be calling functions intended only for testing from
production code.  It is OK to ignore this warning if you know what
you are doing, as the heuristics used to detect the situation are
not perfect.  The commit queue will not block on this warning."

 
 #if defined(GOOGLE_TV)
   void AttachExternalVideoSurface(int player_id, jobject surface);
   void DetachExternalVideoSurface(int player_id);
 #endif
 
   // Called to disble the current fullscreen playback if the video is encrypted.
   // TODO(qinmin): remove this once we have the new fullscreen mode.
   void DisableFullscreenEncryptedMediaPlayback();
 
@@ skipping 108 matching lines @@
   scoped_ptr<media::MediaResourceGetter> media_resource_getter_;
 
   base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_