summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-04 21:47:02 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-04 21:47:02 +0000
commit10a1fe9bc36ae828e5baf53d155d2a59d7eb3f93 (patch)
tree85cd1305dee75168fe3c06e9c13e18b5323ec03d /net
parent759c4f3fe131ad15d87a85ad00aae191cf6a08c3 (diff)
downloadchromium_src-10a1fe9bc36ae828e5baf53d155d2a59d7eb3f93.zip
chromium_src-10a1fe9bc36ae828e5baf53d155d2a59d7eb3f93.tar.gz
chromium_src-10a1fe9bc36ae828e5baf53d155d2a59d7eb3f93.tar.bz2
Avoid size mismatch on windows.
Review URL: http://codereview.chromium.org/9137 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/url_request/url_request_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 4c55aea..ab5c72d 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -331,11 +331,12 @@ TEST(URLRequestTest, PostFileTest) {
MessageLoop::current()->Run();
- int64 size;
- ASSERT_EQ(true, file_util::GetFileSize(path, &size));
+ int64 longsize;
+ ASSERT_EQ(true, file_util::GetFileSize(path, &longsize));
+ int size = static_cast<int>(longsize);
scoped_array<char> buf(new char[size]);
- int64 size_read = file_util::ReadFile(path, buf.get(), size);
+ int size_read = static_cast<int>(file_util::ReadFile(path, buf.get(), size));
ASSERT_EQ(size, size_read);
ASSERT_EQ(1, d.response_started_count()) << "request failed: " <<