win: various porting for http_body_test.cc

util/net/http_body_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 78 matching lines @@
     EXPECT_EQ('b', buf[1]);  // Unmodified from last read.
     EXPECT_EQ(0, stream.GetBytesBuffer(buf, sizeof(buf)));
     EXPECT_EQ('c', buf[0]);
     EXPECT_EQ('b', buf[1]);
   }
 }
 
 TEST(FileHTTPBodyStream, ReadASCIIFile) {
   // TODO(rsesek): Use a more robust mechanism to locate testdata
   // <https://code.google.com/p/crashpad/issues/detail?id=4>.
-  base::FilePath path = base::FilePath("util/net/testdata/ascii_http_body.txt");
+  base::FilePath path = base::FilePath(
+      FILE_PATH_LITERAL("util/net/testdata/ascii_http_body.txt"));
   FileHTTPBodyStream stream(path);
   std::string contents = ReadStreamToString(&stream, 32);
   EXPECT_EQ("This is a test.\n", contents);
 
   // Make sure that the file is not read again after it has been read to
   // completion.
   uint8_t buf[8];
   memset(buf, '!', sizeof(buf));
   EXPECT_EQ(0, stream.GetBytesBuffer(buf, sizeof(buf)));
   ExpectBufferSet(buf, '!', sizeof(buf));
   EXPECT_EQ(0, stream.GetBytesBuffer(buf, sizeof(buf)));
   ExpectBufferSet(buf, '!', sizeof(buf));
 }
 
 TEST(FileHTTPBodyStream, ReadBinaryFile) {
   // HEX contents of file: |FEEDFACE A11A15|.
   // TODO(rsesek): Use a more robust mechanism to locate testdata
   // <https://code.google.com/p/crashpad/issues/detail?id=4>.
-  base::FilePath path =
-      base::FilePath("util/net/testdata/binary_http_body.dat");
+  base::FilePath path = base::FilePath(
+      FILE_PATH_LITERAL("util/net/testdata/binary_http_body.dat"));
   // This buffer size was chosen so that reading the file takes multiple reads.
   uint8_t buf[4];
 
   FileHTTPBodyStream stream(path);
 
   memset(buf, '!', sizeof(buf));
   EXPECT_EQ(4, stream.GetBytesBuffer(buf, sizeof(buf)));
   EXPECT_EQ(0xfe, buf[0]);
   EXPECT_EQ(0xed, buf[1]);
   EXPECT_EQ(0xfa, buf[2]);
   EXPECT_EQ(0xce, buf[3]);
 
   memset(buf, '!', sizeof(buf));
   EXPECT_EQ(3, stream.GetBytesBuffer(buf, sizeof(buf)));
   EXPECT_EQ(0xa1, buf[0]);
   EXPECT_EQ(0x1a, buf[1]);
   EXPECT_EQ(0x15, buf[2]);
   EXPECT_EQ('!', buf[3]);
 
   memset(buf, '!', sizeof(buf));
   EXPECT_EQ(0, stream.GetBytesBuffer(buf, sizeof(buf)));
   ExpectBufferSet(buf, '!', sizeof(buf));
   EXPECT_EQ(0, stream.GetBytesBuffer(buf, sizeof(buf)));
   ExpectBufferSet(buf, '!', sizeof(buf));
 }
 
 TEST(FileHTTPBodyStream, NonExistentFile) {
-  base::FilePath path =
-      base::FilePath("/var/empty/crashpad/util/net/http_body/null");
+  base::FilePath path = base::FilePath(
+      FILE_PATH_LITERAL("/var/empty/crashpad/util/net/http_body/null"));
   FileHTTPBodyStream stream(path);
 
   uint8_t buf = 0xff;
   EXPECT_LT(stream.GetBytesBuffer(&buf, 1), 0);
   EXPECT_EQ(0xff, buf);
   EXPECT_LT(stream.GetBytesBuffer(&buf, 1), 0);
   EXPECT_EQ(0xff, buf);
 }
 
 TEST(CompositeHTTPBodyStream, TwoEmptyStrings) {
@@ skipping 10 matching lines @@
 }
 
 class CompositeHTTPBodyStreamBufferSize
     : public testing::TestWithParam<size_t> {
 };
 
 TEST_P(CompositeHTTPBodyStreamBufferSize, ThreeStringParts) {
   std::string string1("crashpad");
   std::string string2("test");
   std::string string3("foobar");
-  const size_t all_strings_length = string1.length() + string2.length() +
-      string3.length();
-  uint8_t buf[all_strings_length + 3];
-  memset(buf, '!', sizeof(buf));
+  const size_t all_strings_length =

[Mark Mentovai, 2015/01/07 22:47:27]

We could make this constexpr, but then it’d have to be a different expression,
and that expression would be suckier.

[scottmg, 2015/01/07 23:01:11]

No constexpr support in VS2013. :(

+      string1.length() + string2.length() + string3.length();
+  scoped_ptr<uint8_t[]> buf(new uint8_t[all_strings_length + 3]);

[Mark Mentovai, 2015/01/07 22:47:27]

Maybe it’s more natural to make this std::string buf(all_strings_length + 3,
'!'); and lose the memset.

(And then the #include, too…looks like it was unused before you added this
scoped_ptr.)

[scottmg, 2015/01/07 23:01:11]

Done.

+  memset(buf.get(), '!', all_strings_length + 3);
 
   std::vector<HTTPBodyStream*> parts;
   parts.push_back(new StringHTTPBodyStream(string1));
   parts.push_back(new StringHTTPBodyStream(string2));
   parts.push_back(new StringHTTPBodyStream(string3));
 
   CompositeHTTPBodyStream stream(parts);
 
   std::string actual_string = ReadStreamToString(&stream, GetParam());
   EXPECT_EQ(string1 + string2 + string3, actual_string);
 
-  ExpectBufferSet(buf + all_strings_length, '!',
-      sizeof(buf) - all_strings_length);
+  ExpectBufferSet(buf.get() + all_strings_length, '!', 3);
 }
 
 TEST_P(CompositeHTTPBodyStreamBufferSize, StringsAndFile) {
   std::string string1("Hello! ");
   std::string string2(" Goodbye :)");
 
   std::vector<HTTPBodyStream*> parts;
   parts.push_back(new StringHTTPBodyStream(string1));
-  parts.push_back(new FileHTTPBodyStream(
-      base::FilePath("util/net/testdata/ascii_http_body.txt")));
+  parts.push_back(new FileHTTPBodyStream(base::FilePath(
+      FILE_PATH_LITERAL("util/net/testdata/ascii_http_body.txt"))));
   parts.push_back(new StringHTTPBodyStream(string2));
 
   CompositeHTTPBodyStream stream(parts);
 
   std::string expected_string = string1 + "This is a test.\n" + string2;
   std::string actual_string = ReadStreamToString(&stream, GetParam());
   EXPECT_EQ(expected_string, actual_string);
 }
 
 INSTANTIATE_TEST_CASE_P(VariableBufferSize,
                         CompositeHTTPBodyStreamBufferSize,
                         testing::Values(1, 2, 9, 16, 31, 128, 1024));
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad