Index: chrome/browser/diagnostics/sqlite_diagnostics.cc |
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc |
index 77a509441bab5b7193b368a314a5dcf857a1b1f7..42056e4aabb7891e5939e5f19f745657ce88285e 100644 |
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc |
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc |
@@ -10,6 +10,7 @@ |
#include "base/files/file_util.h" |
#include "base/logging.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/singleton.h" |
#include "base/memory/weak_ptr.h" |
@@ -205,62 +206,65 @@ class SqliteIntegrityTest : public DiagnosticsTest { |
} // namespace |
-DiagnosticsTest* MakeSqliteCookiesDbTest() { |
- return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL, |
- DIAGNOSTICS_SQLITE_INTEGRITY_COOKIE_TEST, |
- base::FilePath(chrome::kCookieFilename)); |
+std::unique_ptr<DiagnosticsTest> MakeSqliteCookiesDbTest() { |
+ return base::MakeUnique<SqliteIntegrityTest>( |
+ SqliteIntegrityTest::CRITICAL, DIAGNOSTICS_SQLITE_INTEGRITY_COOKIE_TEST, |
+ base::FilePath(chrome::kCookieFilename)); |
} |
-DiagnosticsTest* MakeSqliteWebDatabaseTrackerDbTest() { |
+std::unique_ptr<DiagnosticsTest> MakeSqliteWebDatabaseTrackerDbTest() { |
base::FilePath databases_dir(storage::kDatabaseDirectoryName); |
base::FilePath tracker_db = |
databases_dir.Append(storage::kTrackerDatabaseFileName); |
- return new SqliteIntegrityTest( |
+ return base::MakeUnique<SqliteIntegrityTest>( |
SqliteIntegrityTest::NO_FLAGS_SET, |
- DIAGNOSTICS_SQLITE_INTEGRITY_DATABASE_TRACKER_TEST, |
- tracker_db); |
+ DIAGNOSTICS_SQLITE_INTEGRITY_DATABASE_TRACKER_TEST, tracker_db); |
} |
-DiagnosticsTest* MakeSqliteHistoryDbTest() { |
- return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL, |
- DIAGNOSTICS_SQLITE_INTEGRITY_HISTORY_TEST, |
- base::FilePath(history::kHistoryFilename)); |
+std::unique_ptr<DiagnosticsTest> MakeSqliteHistoryDbTest() { |
+ return base::MakeUnique<SqliteIntegrityTest>( |
+ SqliteIntegrityTest::CRITICAL, DIAGNOSTICS_SQLITE_INTEGRITY_HISTORY_TEST, |
+ base::FilePath(history::kHistoryFilename)); |
} |
#if defined(OS_CHROMEOS) |
-DiagnosticsTest* MakeSqliteNssCertDbTest() { |
+std::unique_ptr<DiagnosticsTest> MakeSqliteNssCertDbTest() { |
base::FilePath home_dir; |
PathService::Get(base::DIR_HOME, &home_dir); |
- return new SqliteIntegrityTest(SqliteIntegrityTest::REMOVE_IF_CORRUPT, |
- DIAGNOSTICS_SQLITE_INTEGRITY_NSS_CERT_TEST, |
- home_dir.Append(chromeos::kNssCertDbPath)); |
+ return base::MakeUnique<SqliteIntegrityTest>( |
+ SqliteIntegrityTest::REMOVE_IF_CORRUPT, |
+ DIAGNOSTICS_SQLITE_INTEGRITY_NSS_CERT_TEST, |
+ home_dir.Append(chromeos::kNssCertDbPath)); |
} |
-DiagnosticsTest* MakeSqliteNssKeyDbTest() { |
+std::unique_ptr<DiagnosticsTest> MakeSqliteNssKeyDbTest() { |
base::FilePath home_dir; |
PathService::Get(base::DIR_HOME, &home_dir); |
- return new SqliteIntegrityTest(SqliteIntegrityTest::REMOVE_IF_CORRUPT, |
- DIAGNOSTICS_SQLITE_INTEGRITY_NSS_KEY_TEST, |
- home_dir.Append(chromeos::kNssKeyDbPath)); |
+ return base::MakeUnique<SqliteIntegrityTest>( |
+ SqliteIntegrityTest::REMOVE_IF_CORRUPT, |
+ DIAGNOSTICS_SQLITE_INTEGRITY_NSS_KEY_TEST, |
+ home_dir.Append(chromeos::kNssKeyDbPath)); |
} |
#endif // defined(OS_CHROMEOS) |
-DiagnosticsTest* MakeSqliteFaviconsDbTest() { |
- return new SqliteIntegrityTest(SqliteIntegrityTest::NO_FLAGS_SET, |
- DIAGNOSTICS_SQLITE_INTEGRITY_FAVICONS_TEST, |
- base::FilePath(history::kFaviconsFilename)); |
+std::unique_ptr<DiagnosticsTest> MakeSqliteFaviconsDbTest() { |
+ return base::MakeUnique<SqliteIntegrityTest>( |
+ SqliteIntegrityTest::NO_FLAGS_SET, |
+ DIAGNOSTICS_SQLITE_INTEGRITY_FAVICONS_TEST, |
+ base::FilePath(history::kFaviconsFilename)); |
} |
-DiagnosticsTest* MakeSqliteTopSitesDbTest() { |
- return new SqliteIntegrityTest(SqliteIntegrityTest::NO_FLAGS_SET, |
- DIAGNOSTICS_SQLITE_INTEGRITY_TOPSITES_TEST, |
- base::FilePath(history::kTopSitesFilename)); |
+std::unique_ptr<DiagnosticsTest> MakeSqliteTopSitesDbTest() { |
+ return base::MakeUnique<SqliteIntegrityTest>( |
+ SqliteIntegrityTest::NO_FLAGS_SET, |
+ DIAGNOSTICS_SQLITE_INTEGRITY_TOPSITES_TEST, |
+ base::FilePath(history::kTopSitesFilename)); |
} |
-DiagnosticsTest* MakeSqliteWebDataDbTest() { |
- return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL, |
- DIAGNOSTICS_SQLITE_INTEGRITY_WEB_DATA_TEST, |
- base::FilePath(kWebDataFilename)); |
+std::unique_ptr<DiagnosticsTest> MakeSqliteWebDataDbTest() { |
+ return base::MakeUnique<SqliteIntegrityTest>( |
+ SqliteIntegrityTest::CRITICAL, DIAGNOSTICS_SQLITE_INTEGRITY_WEB_DATA_TEST, |
+ base::FilePath(kWebDataFilename)); |
} |
} // namespace diagnostics |