Index: clang/unittests/Tooling/HeaderAnalysisTest.cpp
===================================================================
--- clang/unittests/Tooling/HeaderAnalysisTest.cpp
+++ clang/unittests/Tooling/HeaderAnalysisTest.cpp
@@ -50,15 +50,15 @@
   const auto &SM = AST.sourceManager();
   auto &FM = SM.getFileManager();
   auto &HI = AST.preprocessor().getHeaderSearchInfo();
-  auto getFileID = [&](llvm::StringRef FileName) {
-    return SM.translateFile(FM.getFile(FileName).get());
+  auto getFileEntry = [&](llvm::StringRef FileName) {
+    return FM.getFile(FileName).get();
   };
-  EXPECT_TRUE(isSelfContainedHeader(getFileID("headerguard.h"), SM, HI));
-  EXPECT_TRUE(isSelfContainedHeader(getFileID("pragmaonce.h"), SM, HI));
-  EXPECT_TRUE(isSelfContainedHeader(getFileID("imported.h"), SM, HI));
+  EXPECT_TRUE(isSelfContainedHeader(getFileEntry("headerguard.h"), SM, HI));
+  EXPECT_TRUE(isSelfContainedHeader(getFileEntry("pragmaonce.h"), SM, HI));
+  EXPECT_TRUE(isSelfContainedHeader(getFileEntry("imported.h"), SM, HI));
 
-  EXPECT_FALSE(isSelfContainedHeader(getFileID("unguarded.h"), SM, HI));
-  EXPECT_FALSE(isSelfContainedHeader(getFileID("bad.h"), SM, HI));
+  EXPECT_FALSE(isSelfContainedHeader(getFileEntry("unguarded.h"), SM, HI));
+  EXPECT_FALSE(isSelfContainedHeader(getFileEntry("bad.h"), SM, HI));
 }
 
 } // namespace