Add FileReaderInterface. Move StringFileWriter to StringFile and

minidump/minidump_system_info_writer_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 11 matching lines @@
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
 #include "minidump/test/minidump_string_writer_test_util.h"
 #include "minidump/test/minidump_writable_test_util.h"
 #include "snapshot/test/test_system_snapshot.h"
-#include "util/file/string_file_writer.h"
+#include "util/file/string_file.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 void GetSystemInfoStream(const std::string& file_contents,
                          size_t csd_version_length,
                          const MINIDUMP_SYSTEM_INFO** system_info,
                          const MINIDUMP_STRING** csd_version) {
   // The expected number of bytes for the CSD version’s MINIDUMP_STRING::Buffer.
@@ skipping 34 matching lines @@
 }
 
 TEST(MinidumpSystemInfoWriter, Empty) {
   MinidumpFileWriter minidump_file_writer;
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
 
   system_info_writer->SetCSDVersion(std::string());
 
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(
-      GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version));
+      GetSystemInfoStream(string_file.string(), 0, &system_info, &csd_version));
 
   EXPECT_EQ(kMinidumpCPUArchitectureUnknown,
             system_info->ProcessorArchitecture);
   EXPECT_EQ(0u, system_info->ProcessorLevel);
   EXPECT_EQ(0u, system_info->ProcessorRevision);
   EXPECT_EQ(0u, system_info->NumberOfProcessors);
   EXPECT_EQ(0u, system_info->ProductType);
   EXPECT_EQ(0u, system_info->MajorVersion);
   EXPECT_EQ(0u, system_info->MinorVersion);
   EXPECT_EQ(0u, system_info->BuildNumber);
@@ skipping 43 matching lines @@
   system_info_writer->SetOSVersion(
       kOSVersionMajor, kOSVersionMinor, kOSVersionBuild);
   system_info_writer->SetCSDVersion(kCSDVersion);
   system_info_writer->SetSuiteMask(kSuiteMask);
   system_info_writer->SetCPUX86VendorString(kCPUVendor);
   system_info_writer->SetCPUX86VersionAndFeatures(kCPUVersion, kCPUFeatures);
   system_info_writer->SetCPUX86AMDExtendedFeatures(kAMDFeatures);
 
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(
-      file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version));
+      string_file.string(), strlen(kCSDVersion), &system_info, &csd_version));
 
   EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture);
   EXPECT_EQ(kCPULevel, system_info->ProcessorLevel);
   EXPECT_EQ(kCPURevision, system_info->ProcessorRevision);
   EXPECT_EQ(kCPUCount, system_info->NumberOfProcessors);
   EXPECT_EQ(kOSType, system_info->ProductType);
   EXPECT_EQ(kOSVersionMajor, system_info->MajorVersion);
   EXPECT_EQ(kOSVersionMinor, system_info->MinorVersion);
   EXPECT_EQ(kOSVersionBuild, system_info->BuildNumber);
   EXPECT_EQ(kOS, system_info->PlatformId);
@@ skipping 32 matching lines @@
   system_info_writer->SetCPUCount(kCPUCount);
   system_info_writer->SetOS(kOS);
   system_info_writer->SetOSType(kMinidumpOSTypeWorkstation);
   system_info_writer->SetOSVersion(
       kOSVersionMajor, kOSVersionMinor, kOSVersionBuild);
   system_info_writer->SetCSDVersion(kCSDVersion);
   system_info_writer->SetCPUOtherFeatures(kCPUFeatures[0], kCPUFeatures[1]);
 
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version;
 
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(
-      file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version));
+      string_file.string(), strlen(kCSDVersion), &system_info, &csd_version));
 
   EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture);
   EXPECT_EQ(kCPULevel, system_info->ProcessorLevel);
   EXPECT_EQ(kCPURevision, system_info->ProcessorRevision);
   EXPECT_EQ(kCPUCount, system_info->NumberOfProcessors);
   EXPECT_EQ(kOSType, system_info->ProductType);
   EXPECT_EQ(kOSVersionMajor, system_info->MajorVersion);
   EXPECT_EQ(kOSVersionMinor, system_info->MinorVersion);
   EXPECT_EQ(kOSVersionBuild, system_info->BuildNumber);
   EXPECT_EQ(kOS, system_info->PlatformId);
@@ skipping 14 matching lines @@
   const MinidumpCPUArchitecture kCPUArchitecture = kMinidumpCPUArchitectureX86;
   const uint32_t kCPUVendor[] = {'uneG', 'Ieni', 'letn'};
 
   system_info_writer->SetCPUArchitecture(kCPUArchitecture);
   system_info_writer->SetCPUX86Vendor(
       kCPUVendor[0], kCPUVendor[1], kCPUVendor[2]);
   system_info_writer->SetCSDVersion(std::string());
 
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version;
 
   ASSERT_NO_FATAL_FAILURE(
-      GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version));
+      GetSystemInfoStream(string_file.string(), 0, &system_info, &csd_version));
 
   EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture);
   EXPECT_EQ(0u, system_info->ProcessorLevel);
   EXPECT_EQ(kCPUVendor[0], system_info->Cpu.X86CpuInfo.VendorId[0]);
   EXPECT_EQ(kCPUVendor[1], system_info->Cpu.X86CpuInfo.VendorId[1]);
   EXPECT_EQ(kCPUVendor[2], system_info->Cpu.X86CpuInfo.VendorId[2]);
   EXPECT_EQ(0u, system_info->Cpu.X86CpuInfo.VersionInformation);
 }
 
 TEST(MinidumpSystemInfoWriter, InitializeFromSnapshot_X86) {
@@ skipping 52 matching lines @@
                                expect_system_info.MinorVersion,
                                expect_system_info.BuildNumber,
                                kOSVersionBuild);
 
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
   system_info_writer->InitializeFromSnapshot(&system_snapshot);
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version = nullptr;
-  ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(file_writer.string(),
+  ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(string_file.string(),
                                               strlen(kOSVersionBuild),
                                               &system_info,
                                               &csd_version));
 
   EXPECT_EQ(expect_system_info.ProcessorArchitecture,
             system_info->ProcessorArchitecture);
   EXPECT_EQ(expect_system_info.ProcessorLevel, system_info->ProcessorLevel);
   EXPECT_EQ(expect_system_info.ProcessorRevision,
             system_info->ProcessorRevision);
   EXPECT_EQ(expect_system_info.NumberOfProcessors,
@@ skipping 69 matching lines @@
                                expect_system_info.BuildNumber,
                                kOSVersionBuild);
   system_snapshot.SetNXEnabled(true);
 
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
   system_info_writer->InitializeFromSnapshot(&system_snapshot);
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
+  StringFile string_file;
+  ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version = nullptr;
-  ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(file_writer.string(),
+  ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(string_file.string(),
                                               strlen(kOSVersionBuild),
                                               &system_info,
                                               &csd_version));
 
   EXPECT_EQ(expect_system_info.ProcessorArchitecture,
             system_info->ProcessorArchitecture);
   EXPECT_EQ(expect_system_info.ProcessorLevel, system_info->ProcessorLevel);
   EXPECT_EQ(expect_system_info.ProcessorRevision,
             system_info->ProcessorRevision);
   EXPECT_EQ(expect_system_info.NumberOfProcessors,
@@ skipping 12 matching lines @@
   for (size_t index = 0; index < strlen(kOSVersionBuild); ++index) {
     EXPECT_EQ(kOSVersionBuild[index], csd_version->Buffer[index]) << index;
   }
 }
 
 TEST(MinidumpSystemInfoWriterDeathTest, NoCSDVersion) {
   MinidumpFileWriter minidump_file_writer;
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
-  StringFileWriter file_writer;
-  ASSERT_DEATH(minidump_file_writer.WriteEverything(&file_writer),
+  StringFile string_file;
+  ASSERT_DEATH(minidump_file_writer.WriteEverything(&string_file),
                "csd_version_");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad