Index: chrome/browser/component_updater/cld_component_installer.cc |
diff --git a/chrome/browser/component_updater/cld_component_installer.cc b/chrome/browser/component_updater/cld_component_installer.cc |
index 3ec1f595e63dec2dfdbf71ac4ce59db7796bc49d..2e35a32a7fd84a92cc2913ea1fbf51effbd68a2a 100644 |
--- a/chrome/browser/component_updater/cld_component_installer.cc |
+++ b/chrome/browser/component_updater/cld_component_installer.cc |
@@ -15,8 +15,8 @@ |
#include "base/path_service.h" |
#include "base/platform_file.h" |
#include "chrome/browser/profiles/profile.h" |
-#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths.h" |
+#include "components/translate/content/browser/data_file_browser_cld_data_provider.h" |
#include "content/public/browser/browser_thread.h" |
#include "net/ssl/ssl_config_service.h" |
@@ -31,8 +31,10 @@ namespace { |
// lock to guard it. See GetLatestCldDataFile(...) for more info. |
base::LazyInstance<base::Lock> cld_file_lock = LAZY_INSTANCE_INITIALIZER; |
base::LazyInstance<base::FilePath> cld_file = LAZY_INSTANCE_INITIALIZER; |
+const base::FilePath::CharType kCLDDataFilename[] = |
+ FILE_PATH_LITERAL("cld2_data.bin"); |
-} |
+} // namespace |
namespace component_updater { |
@@ -67,7 +69,7 @@ base::FilePath CldComponentInstallerTraits::GetInstalledPath( |
// NB: This may change when 64-bit is officially supported. |
return base.Append(FILE_PATH_LITERAL("_platform_specific")) |
.Append(FILE_PATH_LITERAL("all")) |
- .Append(chrome::kCLDDataFilename); |
+ .Append(kCLDDataFilename); |
} |
void CldComponentInstallerTraits::ComponentReady( |
@@ -118,8 +120,11 @@ void RegisterCldComponent(ComponentUpdateService* cus) { |
void CldComponentInstallerTraits::SetLatestCldDataFile( |
const base::FilePath& path) { |
VLOG(1) << "Setting CLD data file location: " << path.value(); |
- base::AutoLock lock(cld_file_lock.Get()); |
- cld_file.Get() = path; |
+ { |
+ base::AutoLock lock(cld_file_lock.Get()); |
+ cld_file.Get() = path; |
+ } |
+ content::SetCldDataFilePath(path); |
} |
base::FilePath GetLatestCldDataFile() { |