Revert 270872 "Move all callers of GetHomeDir() to PathService::..."

trunk/src/chrome/browser/diagnostics/sqlite_diagnostics.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 
-#include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 216 matching lines @@
 }
 
 DiagnosticsTest* MakeSqliteHistoryDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_HISTORY_TEST,
                                  base::FilePath(chrome::kHistoryFilename));
 }
 
 #if defined(OS_CHROMEOS)
 DiagnosticsTest* MakeSqliteNssCertDbTest() {
-  base::FilePath home_dir;
-  PathService::Get(base::DIR_HOME, &home_dir);
+  base::FilePath home_dir = base::GetHomeDir();
   return new SqliteIntegrityTest(SqliteIntegrityTest::REMOVE_IF_CORRUPT,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_NSS_CERT_TEST,
                                  home_dir.Append(chromeos::kNssCertDbPath));
 }
 
 DiagnosticsTest* MakeSqliteNssKeyDbTest() {
-  base::FilePath home_dir;
-  PathService::Get(base::DIR_HOME, &home_dir);
+  base::FilePath home_dir = base::GetHomeDir();
   return new SqliteIntegrityTest(SqliteIntegrityTest::REMOVE_IF_CORRUPT,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_NSS_KEY_TEST,
                                  home_dir.Append(chromeos::kNssKeyDbPath));
 }
 #endif  // defined(OS_CHROMEOS)
 
 DiagnosticsTest* MakeSqliteThumbnailsDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::NO_FLAGS_SET,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_THUMBNAILS_TEST,
                                  base::FilePath(chrome::kThumbnailsFilename));
 }
 
 DiagnosticsTest* MakeSqliteWebDataDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_WEB_DATA_TEST,
                                  base::FilePath(kWebDataFilename));
 }
 
 }  // namespace diagnostics