| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index ff3dc9bcfcc765b568423e2bb6b1e870402a97d7..5a18690421708ce298449b914aae9e3556a3ef6a 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -385,9 +385,18 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) {
|
| // a task to the UI thread to do registration once you done the necessary
|
| // file IO to know you existing component version.
|
| #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
|
| - RegisterRecoveryComponent(cus, g_browser_process->local_state());
|
| + base::FilePath recovery_base_dir;
|
| + if (PathService::Get(chrome::DIR_RECOVERY_BASE, &recovery_base_dir)) {
|
| + RegisterRecoveryComponent(cus, g_browser_process->local_state(),
|
| + recovery_base_dir);
|
| + }
|
| +
|
| RegisterPepperFlashComponent(cus);
|
| - RegisterSwiftShaderComponent(cus);
|
| +
|
| + base::FilePath user_data_dir;
|
| + if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
|
| + RegisterSwiftShaderComponent(cus, user_data_dir);
|
| + }
|
| #endif
|
|
|
| #if !defined(OS_ANDROID)
|
| @@ -407,7 +416,11 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) {
|
| #endif
|
|
|
| #if defined(CLD2_DYNAMIC_MODE) && defined(CLD2_IS_COMPONENT)
|
| - RegisterCldComponent(cus);
|
| + base::FilePath cld2_base_dir;
|
| + if (PathService::Get(chrome::DIR_COMPONENT_CLD2, &cld2_base_dir)) {
|
| + RegisterCldComponent(cus, cld2_base_dir,
|
| + base::FilePath(chrome::kCLDDataFilename));
|
| + }
|
| #endif
|
|
|
| cus->Start();
|
|
|