Replace NULL with nullptr

Also fixed some lines that were too long, and a few other minor
details.

Change-Id: I6efba5fb6e03eb5d0a300fddb2a75bf8e2f175cb
diff --git a/compiler/output_stream_test.cc b/compiler/output_stream_test.cc
index bba9892..fbc9d0d 100644
--- a/compiler/output_stream_test.cc
+++ b/compiler/output_stream_test.cc
@@ -66,7 +66,7 @@
   SetOutputStream(output_stream);
   GenerateTestOutput();
   std::unique_ptr<File> in(OS::OpenFileForReading(tmp.GetFilename().c_str()));
-  EXPECT_TRUE(in.get() != NULL);
+  EXPECT_TRUE(in.get() != nullptr);
   std::vector<uint8_t> actual(in->GetLength());
   bool readSuccess = in->ReadFully(&actual[0], actual.size());
   EXPECT_TRUE(readSuccess);
@@ -76,12 +76,12 @@
 TEST_F(OutputStreamTest, Buffered) {
   ScratchFile tmp;
   std::unique_ptr<FileOutputStream> file_output_stream(new FileOutputStream(tmp.GetFile()));
-  CHECK(file_output_stream.get() != NULL);
+  CHECK(file_output_stream.get() != nullptr);
   BufferedOutputStream buffered_output_stream(file_output_stream.release());
   SetOutputStream(buffered_output_stream);
   GenerateTestOutput();
   std::unique_ptr<File> in(OS::OpenFileForReading(tmp.GetFilename().c_str()));
-  EXPECT_TRUE(in.get() != NULL);
+  EXPECT_TRUE(in.get() != nullptr);
   std::vector<uint8_t> actual(in->GetLength());
   bool readSuccess = in->ReadFully(&actual[0], actual.size());
   EXPECT_TRUE(readSuccess);