3 files changed, 7 insertions, 7 deletions
diff --git a/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp b/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp
index 6b9158445d7..795a4351b50 100644
--- a/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp
+++ b/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp
@@ -44,13 +44,13 @@ public:
     llvm::SmallString<256> ASTFileName;
     ASSERT_FALSE(
         llvm::sys::fs::createTemporaryFile("f_ast", "ast", ASTFD, ASTFileName));
-    llvm::tool_output_file ASTFile(ASTFileName, ASTFD);
+    llvm::ToolOutputFile ASTFile(ASTFileName, ASTFD);
 
     int IndexFD;
     llvm::SmallString<256> IndexFileName;
     ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("index", "txt", IndexFD,
                                                     IndexFileName));
-    llvm::tool_output_file IndexFile(IndexFileName, IndexFD);
+    llvm::ToolOutputFile IndexFile(IndexFileName, IndexFD);
     IndexFile.os() << "c:@F@f#I# " << ASTFileName << "\n";
     IndexFile.os().flush();
     EXPECT_TRUE(llvm::sys::fs::exists(IndexFileName));
@@ -61,7 +61,7 @@ public:
     llvm::SmallString<256> SourceFileName;
     ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("input", "cpp", SourceFD,
                                                     SourceFileName));
-    llvm::tool_output_file SourceFile(SourceFileName, SourceFD);
+    llvm::ToolOutputFile SourceFile(SourceFileName, SourceFD);
     SourceFile.os() << SourceText;
     SourceFile.os().flush();
     EXPECT_TRUE(llvm::sys::fs::exists(SourceFileName));
@@ -118,7 +118,7 @@ TEST(CrossTranslationUnit, IndexFormatCanBeParsed) {
   llvm::SmallString<256> IndexFileName;
   ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("index", "txt", IndexFD,
                                                   IndexFileName));
-  llvm::tool_output_file IndexFile(IndexFileName, IndexFD);
+  llvm::ToolOutputFile IndexFile(IndexFileName, IndexFD);
   IndexFile.os() << IndexText;
   IndexFile.os().flush();
   EXPECT_TRUE(llvm::sys::fs::exists(IndexFileName));
diff --git a/clang/unittests/Frontend/ASTUnitTest.cpp b/clang/unittests/Frontend/ASTUnitTest.cpp
index a7d08a992f4..4f529cf55de 100644
--- a/clang/unittests/Frontend/ASTUnitTest.cpp
+++ b/clang/unittests/Frontend/ASTUnitTest.cpp
@@ -41,7 +41,7 @@ TEST(ASTUnit, SaveLoadPreservesLangOptionsInPrintingPolicy) {
   int FD;
   llvm::SmallString<256> InputFileName;
   ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("ast-unit", "cpp", FD, InputFileName));
-  tool_output_file input_file(InputFileName, FD);
+  ToolOutputFile input_file(InputFileName, FD);
   input_file.os() << "";
 
   const char* Args[] = {"clang", "-xc++", InputFileName.c_str()};
@@ -69,7 +69,7 @@ TEST(ASTUnit, SaveLoadPreservesLangOptionsInPrintingPolicy) {
 
   llvm::SmallString<256> ASTFileName;
   ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("ast-unit", "ast", FD, ASTFileName));
-  tool_output_file ast_file(ASTFileName, FD);
+  ToolOutputFile ast_file(ASTFileName, FD);
   AST->Save(ASTFileName.str());
 
   EXPECT_TRUE(llvm::sys::fs::exists(ASTFileName));
diff --git a/clang/unittests/Frontend/CompilerInstanceTest.cpp b/clang/unittests/Frontend/CompilerInstanceTest.cpp
index 30775bc3f72..b2d9f8bcf00 100644
--- a/clang/unittests/Frontend/CompilerInstanceTest.cpp
+++ b/clang/unittests/Frontend/CompilerInstanceTest.cpp
@@ -24,7 +24,7 @@ TEST(CompilerInstance, DefaultVFSOverlayFromInvocation) {
   int FD;
   SmallString<256> FileName;
   ASSERT_FALSE(sys::fs::createTemporaryFile("vfs", "yaml", FD, FileName));
-  tool_output_file File(FileName, FD);
+  ToolOutputFile File(FileName, FD);
 
   SmallString<256> CurrentPath;
   sys::fs::current_path(CurrentPath);