diff --git a/clang-tools-extra/modularize/CoverageChecker.cpp b/clang-tools-extra/modularize/CoverageChecker.cpp
index 630ab558c5f8..510d062d0796 100644
--- a/clang-tools-extra/modularize/CoverageChecker.cpp
+++ b/clang-tools-extra/modularize/CoverageChecker.cpp
@@ -150,12 +150,12 @@ CoverageChecker::CoverageChecker(StringRef ModuleMapPath,
 
 // Create instance of CoverageChecker, to simplify setting up
 // subordinate objects.
-CoverageChecker *CoverageChecker::createCoverageChecker(
-  StringRef ModuleMapPath, std::vector<std::string> &IncludePaths,
-  ArrayRef<std::string> CommandLine, clang::ModuleMap *ModuleMap) {
+std::unique_ptr<CoverageChecker> CoverageChecker::createCoverageChecker(
+    StringRef ModuleMapPath, std::vector<std::string> &IncludePaths,
+    ArrayRef<std::string> CommandLine, clang::ModuleMap *ModuleMap) {
 
-  return new CoverageChecker(ModuleMapPath, IncludePaths, CommandLine,
-    ModuleMap);
+  return llvm::make_unique<CoverageChecker>(ModuleMapPath, IncludePaths,
+                                            CommandLine, ModuleMap);
 }
 
 // Do checks.
diff --git a/clang-tools-extra/modularize/CoverageChecker.h b/clang-tools-extra/modularize/CoverageChecker.h
index a0e5f6f5f7f9..f6c8367a5e04 100644
--- a/clang-tools-extra/modularize/CoverageChecker.h
+++ b/clang-tools-extra/modularize/CoverageChecker.h
@@ -91,10 +91,9 @@ public:
   /// \param CommandLine Compile command line arguments.
   /// \param ModuleMap The module map to check.
   /// \returns Initialized CoverageChecker object.
-  static CoverageChecker *createCoverageChecker(
-    llvm::StringRef ModuleMapPath, std::vector<std::string> &IncludePaths,
-    llvm::ArrayRef<std::string> CommandLine,
-    clang::ModuleMap *ModuleMap);
+  static std::unique_ptr<CoverageChecker> createCoverageChecker(
+      llvm::StringRef ModuleMapPath, std::vector<std::string> &IncludePaths,
+      llvm::ArrayRef<std::string> CommandLine, clang::ModuleMap *ModuleMap);
 
   /// Do checks.
   /// Starting from the directory of the module.modulemap file,
diff --git a/clang-tools-extra/modularize/ModularizeUtilities.cpp b/clang-tools-extra/modularize/ModularizeUtilities.cpp
index bb098da91f9a..874742dacda4 100644
--- a/clang-tools-extra/modularize/ModularizeUtilities.cpp
+++ b/clang-tools-extra/modularize/ModularizeUtilities.cpp
@@ -120,8 +120,9 @@ std::error_code ModularizeUtilities::doCoverageCheck(
   std::error_code EC;
   for (ModuleMapIndex = 0; ModuleMapIndex < ModuleMapCount; ++ModuleMapIndex) {
     std::unique_ptr<clang::ModuleMap> &ModMap = ModuleMaps[ModuleMapIndex];
-    CoverageChecker *Checker = CoverageChecker::createCoverageChecker(
-      InputFilePaths[ModuleMapIndex], IncludePaths, CommandLine, ModMap.get());
+    auto Checker = CoverageChecker::createCoverageChecker(
+        InputFilePaths[ModuleMapIndex], IncludePaths, CommandLine,
+        ModMap.get());
     std::error_code LocalEC = Checker->doChecks();
     if (LocalEC.value() > 0)
       EC = LocalEC;