Backed out changeset 3078e3882816 (bug 1631399) as per Kartikaya's request for causing bug 1634345. CLOSED TREE

build/clang-plugin/mozsearch-plugin/MozsearchIndexer.cpp

@@ -198,7 +198,7 @@ private:
           Absolute = Filename;
         }
       }
-      std::unique_ptr<FileInfo> Info = std::make_unique<FileInfo>(Absolute);
+      std::unique_ptr<FileInfo> Info = llvm::make_unique<FileInfo>(Absolute);
       It = FileMap.insert(std::make_pair(Id, std::move(Info))).first;
     }
     return It->second.get();
@@ -452,7 +452,7 @@ public:
       : CI(CI), SM(CI.getSourceManager()), LO(CI.getLangOpts()), CurMangleContext(nullptr),
         AstContext(nullptr), CurDeclContext(nullptr), TemplateStack(nullptr) {
     CI.getPreprocessor().addPPCallbacks(
-        std::make_unique<PreprocessorHook>(this));
+        llvm::make_unique<PreprocessorHook>(this));
   }
 
   virtual DiagnosticConsumer *clone(DiagnosticsEngine &Diags) const {
@@ -1630,7 +1630,7 @@ class IndexAction : public PluginASTAction {
 protected:
   std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
                                                  llvm::StringRef F) {
-    return std::make_unique<IndexConsumer>(CI);
+    return llvm::make_unique<IndexConsumer>(CI);
   }
 
   bool ParseArgs(const CompilerInstance &CI,