Port more of url_request_unittest.cc....

net/url_request/url_request_unittest.cc

 // Copyright (c) 2006-2008 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 "net/url_request/url_request_unittest.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 313 matching lines @@
     r.AppendFileToUpload(path);
 
     // This file should just be ignored in the upload stream.
     r.AppendFileToUpload(L"c:\\path\\to\\non\\existant\\file.randomness.12345");
 
     r.Start();
     EXPECT_TRUE(r.is_pending());
 
     MessageLoop::current()->Run();
 
-#if defined(OS_WIN)
-    HANDLE file = CreateFile(path.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
-                             OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-    ASSERT_NE(INVALID_HANDLE_VALUE, file);
-
-    DWORD size = GetFileSize(file, NULL);
+    int64 size;
+    ASSERT_EQ(true, file_util::GetFileSize(path, &size));
     scoped_array<char> buf(new char[size]);
 
-    DWORD size_read;
-    EXPECT_TRUE(ReadFile(file, buf.get(), size, &size_read, NULL));
-
-    CloseHandle(file);
-
-    EXPECT_EQ(size, size_read);
+    int64 size_read = file_util::ReadFile(path, buf.get(), size);
+    ASSERT_EQ(size, size_read);
 
     ASSERT_EQ(1, d.response_started_count()) << "request failed: " <<
         (int) r.status().status() << ", os error: " << r.status().os_error();
 
     EXPECT_FALSE(d.received_data_before_response());
 
     ASSERT_EQ(size, d.bytes_received());
     EXPECT_EQ(0, memcmp(d.data_received().c_str(), buf.get(), size));
-#else
-    NOTIMPLEMENTED();
-#endif
   }
 #ifndef NDEBUG
   DCHECK_EQ(url_request_metrics.object_count,0);
 #endif
 }
 
 TEST(URLRequestTest, AboutBlankTest) {
   TestDelegate d;
   {
     TestURLRequest r(GURL("about:blank"), &d);
@@ skipping 401 matching lines @@
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(d.data_received().find("user/secret") != std::string::npos);
 
     // Should be the same cached document, which means that the response time
     // should not have changed.
     EXPECT_TRUE(response_time == r.response_time());
   }
 }