1 files changed, 3 insertions, 11 deletions
diff --git a/clang/include/clang/Serialization/ModuleManager.h b/clang/include/clang/Serialization/ModuleManager.h
index ffc42ce6040..fae387cac7e 100644
--- a/clang/include/clang/Serialization/ModuleManager.h
+++ b/clang/include/clang/Serialization/ModuleManager.h
@@ -27,7 +27,6 @@ class GlobalModuleIndex;
 class MemoryBufferCache;
 class ModuleMap;
 class PCHContainerReader;
-class HeaderSearch;
 
 namespace serialization {
 
@@ -59,9 +58,6 @@ class ModuleManager {
   /// \brief Knows how to unwrap module containers.
   const PCHContainerReader &PCHContainerRdr;
 
-  /// \brief Preprocessor's HeaderSearchInfo containing the module map.
-  const HeaderSearch &HeaderSearchInfo;
-
   /// \brief A lookup of in-memory (virtual file) buffers
   llvm::DenseMap<const FileEntry *, std::unique_ptr<llvm::MemoryBuffer>>
       InMemoryBuffers;
@@ -132,8 +128,7 @@ public:
   typedef std::pair<uint32_t, StringRef> ModuleOffset;
 
   explicit ModuleManager(FileManager &FileMgr, MemoryBufferCache &PCMCache,
-                         const PCHContainerReader &PCHContainerRdr,
-                         const HeaderSearch &HeaderSearchInfo);
+                         const PCHContainerReader &PCHContainerRdr);
   ~ModuleManager();
 
   /// \brief Forward iterator to traverse all loaded modules.
@@ -168,11 +163,8 @@ public:
   /// \brief Returns the module associated with the given index
   ModuleFile &operator[](unsigned Index) const { return *Chain[Index]; }
   
-  /// \brief Returns the module associated with the given file name.
-  ModuleFile *lookupByFileName(StringRef FileName) const;
-
-  /// \brief Returns the module associated with the given module name.
-  ModuleFile *lookupByModuleName(StringRef ModName) const;
+  /// \brief Returns the module associated with the given name
+  ModuleFile *lookup(StringRef Name) const;
 
   /// \brief Returns the module associated with the given module file.
   ModuleFile *lookup(const FileEntry *File) const;