Fix MediaPlayerBridge to handle unknown or infinite durations.

media/base/android/media_player_bridge.cc

 // Copyright (c) 2012 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 "media/base/android/media_player_bridge.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_util.h"
 #include "jni/MediaPlayerBridge_jni.h"
 #include "media/base/android/media_common_android.h"
 #include "media/base/android/media_player_manager.h"
 #include "media/base/android/media_resource_getter.h"
 #include "media/base/android/media_url_interceptor.h"
+#include "media/base/buffers.h"
 
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 
 namespace media {
 
 MediaPlayerBridge::MediaPlayerBridge(
     int player_id,
     const GURL& url,
     const GURL& first_party_for_cookies,
@@ skipping 333 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   return base::TimeDelta::FromMilliseconds(
       Java_MediaPlayerBridge_getCurrentPosition(
           env, j_media_player_bridge_.obj()));
 }
 
 base::TimeDelta MediaPlayerBridge::GetDuration() {
   if (!prepared_)
     return duration_;
   JNIEnv* env = base::android::AttachCurrentThread();
-  return base::TimeDelta::FromMilliseconds(
-      Java_MediaPlayerBridge_getDuration(
-          env, j_media_player_bridge_.obj()));
+  const int duration_ms =
+      Java_MediaPlayerBridge_getDuration(env, j_media_player_bridge_.obj());
+  return duration_ms < 0 ? media::kInfiniteDuration()
+                         : base::TimeDelta::FromMilliseconds(duration_ms);
 }
 
 void MediaPlayerBridge::Release() {
   if (j_media_player_bridge_.is_null())
     return;
 
   time_update_timer_.Stop();
   if (prepared_)
     pending_seek_ = GetCurrentTime();
   prepared_ = false;
@@ skipping 160 matching lines @@
 
 GURL MediaPlayerBridge::GetFirstPartyForCookies() {
   return first_party_for_cookies_;
 }
 
 bool MediaPlayerBridge::IsSurfaceInUse() const {
   return is_surface_in_use_;
 }
 
 }  // namespace media