From b3d7e7db936bd49c3ac76202fa914cfb6d6c4b8f Mon Sep 17 00:00:00 2001
From: Thomas Inskip <tinskip@google.com>
Date: Tue, 1 Jul 2014 10:26:43 -0700
Subject: [PATCH] Fix for reported build break. Fix for broken unit test on
 32-bit platforms.

Change-Id: Ie9c314b4ea14be2cb3e51c8b06374b22ffdf9200
---
 media/base/muxer_util.cc | 4 ++--
 media/file/udp_file.cc   | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/media/base/muxer_util.cc b/media/base/muxer_util.cc
index 10a0c49fb7..1c1ccca723 100644
--- a/media/base/muxer_util.cc
+++ b/media/base/muxer_util.cc
@@ -145,8 +145,8 @@ std::string GetSegmentName(const std::string& segment_template,
       segment_name +=
           base::StringPrintf(format_tag.c_str(), segment_start_time);
     } else if (identifier == "Bandwidth") {
-      segment_name +=
-          base::StringPrintf(format_tag.c_str(), bandwidth);
+      segment_name += base::StringPrintf(
+          format_tag.c_str(), static_cast<uint64>(bandwidth));
     }
   }
   return segment_name;
diff --git a/media/file/udp_file.cc b/media/file/udp_file.cc
index 81911d47b6..77dd7306fa 100644
--- a/media/file/udp_file.cc
+++ b/media/file/udp_file.cc
@@ -6,14 +6,15 @@
 
 #include "media/file/udp_file.h"
 
-#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "gflags/gflags.h"
-
 #include <arpa/inet.h>
 #include <errno.h>
 #include <strings.h>
 #include <sys/socket.h>
+#include <unistd.h>
+
+#include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
+#include "gflags/gflags.h"
 
 // TODO(tinskip): Adapt to work with winsock.