Switch to standard integer types in media/.

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/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "base/basictypes.h"
 #include "base/logging.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/timestamp_constants.h"
 
 using base::android::ConvertUTF8ToJavaString;
@@ skipping 116 matching lines @@
 }
 
 void MediaPlayerBridge::SetDataSource(const std::string& url) {
   if (j_media_player_bridge_.is_null())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
 
   int fd;
-  int64 offset;
-  int64 size;
+  int64_t offset;
+  int64_t size;
   if (InterceptMediaUrl(url, &fd, &offset, &size)) {
     if (!Java_MediaPlayerBridge_setDataSourceFromFd(
         env, j_media_player_bridge_.obj(), fd, offset, size)) {
       OnMediaError(MEDIA_ERROR_FORMAT);
       return;
     }
   } else {
     // Create a Java String for the URL.
     ScopedJavaLocalRef<jstring> j_url_string =
         ConvertUTF8ToJavaString(env, url);
@@ skipping 20 matching lines @@
         j_cookies.obj(), j_user_agent.obj(), hide_url_log_)) {
       OnMediaError(MEDIA_ERROR_FORMAT);
       return;
     }
   }
 
   if (!Java_MediaPlayerBridge_prepareAsync(env, j_media_player_bridge_.obj()))
     OnMediaError(MEDIA_ERROR_FORMAT);
 }
 
-bool MediaPlayerBridge::InterceptMediaUrl(
-    const std::string& url, int* fd, int64* offset, int64* size) {
+bool MediaPlayerBridge::InterceptMediaUrl(const std::string& url,
+                                          int* fd,
+                                          int64_t* offset,
+                                          int64_t* size) {
   // Sentinel value to check whether the output arguments have been set.
   const int kUnsetValue = -1;
 
   *fd = kUnsetValue;
   *offset = kUnsetValue;
   *size = kUnsetValue;
   media::MediaUrlInterceptor* url_interceptor =
       manager()->GetMediaUrlInterceptor();
   if (url_interceptor && url_interceptor->Intercept(url, fd, offset, size)) {
     DCHECK_NE(kUnsetValue, *fd);
@@ skipping 38 matching lines @@
 }
 
 void MediaPlayerBridge::ExtractMediaMetadata(const std::string& url) {
   if (url.empty()) {
     OnMediaError(MEDIA_ERROR_FORMAT);
     on_decoder_resources_released_cb_.Run(player_id());
     return;
   }
 
   int fd;
-  int64 offset;
-  int64 size;
+  int64_t offset;
+  int64_t size;
   if (InterceptMediaUrl(url, &fd, &offset, &size)) {
     manager()->GetMediaResourceGetter()->ExtractMediaMetadata(
         fd, offset, size,
         base::Bind(&MediaPlayerBridge::OnMediaMetadataExtracted,
                    weak_factory_.GetWeakPtr()));
   } else {
     manager()->GetMediaResourceGetter()->ExtractMediaMetadata(
         url, cookies_, user_agent_,
         base::Bind(&MediaPlayerBridge::OnMediaMetadataExtracted,
                    weak_factory_.GetWeakPtr()));
@@ skipping 273 matching lines @@
 
 GURL MediaPlayerBridge::GetUrl() {
   return url_;
 }
 
 GURL MediaPlayerBridge::GetFirstPartyForCookies() {
   return first_party_for_cookies_;
 }
 
 }  // namespace media