|
|
@@ -18,7 +18,6 @@
|
|
|
#include "base/strings/sys_string_conversions.h"
|
|
|
#include "base/strings/utf_string_conversions.h"
|
|
|
#include "base/task/thread_pool.h"
|
|
|
-#include "chrome/common/chrome_paths.h"
|
|
|
#include "services/wisdom_svc/fingerprint_config_options.h"
|
|
|
#include <codecvt>
|
|
|
|
|
|
@@ -64,7 +63,7 @@ FingerprintConfigOptions::FingerprintConfigOptions()
|
|
|
FingerprintConfigOptions::~FingerprintConfigOptions() {}
|
|
|
|
|
|
bool FingerprintConfigOptions::GetConfigFromAppDir(
|
|
|
- std::string* config_content) {
|
|
|
+ std::string* config_content) {
|
|
|
std::string config_text;
|
|
|
base::FilePath app_dir;
|
|
|
base::PathService::Get(base::DIR_EXE, &app_dir);
|
|
|
@@ -86,13 +85,12 @@ bool FingerprintConfigOptions::GetConfigFromAppDir(
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
-bool FingerprintConfigOptions::GetConfigFromUserDataDir(
|
|
|
+bool FingerprintConfigOptions::GetConfigFromUserDataDir(const std::string& user_data_dir,
|
|
|
std::string* config_content) {
|
|
|
std::string config_text;
|
|
|
- base::FilePath userDataDir;
|
|
|
- base::PathService::Get(chrome::DIR_USER_DATA, &userDataDir);
|
|
|
+ base::FilePath user_data_dir_path(base::UTF8ToWide(user_data_dir));
|
|
|
base::FilePath config_file =
|
|
|
- userDataDir.Append(FILE_PATH_LITERAL("fingerprint.json"));
|
|
|
+ user_data_dir_path.Append(FILE_PATH_LITERAL("fingerprint.json"));
|
|
|
|
|
|
bool result = base::ReadFileToString(config_file, &config_text);
|
|
|
if (result) {
|
|
|
@@ -241,10 +239,10 @@ void FingerprintConfigOptions::StopWatchingConfigFileInternal() {
|
|
|
config_watcher_.reset();
|
|
|
}
|
|
|
|
|
|
-void FingerprintConfigOptions::Init() {
|
|
|
+void FingerprintConfigOptions::Init(const std::string& user_data_dir) {
|
|
|
bool need_decrypt_config = true;
|
|
|
std::string config_text;
|
|
|
- bool result = GetConfigFromUserDataDir(&config_text);
|
|
|
+ bool result = GetConfigFromUserDataDir(user_data_dir, &config_text);
|
|
|
if (!result) {
|
|
|
result = GetConfigFromShareMemory(&config_text);
|
|
|
}
|