Componentize component_updater: Move some paths/constants to component.

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 367 matching lines @@
 #endif
 
 void RegisterComponentsForUpdate(const CommandLine& command_line) {
   component_updater::ComponentUpdateService* cus =
       g_browser_process->component_updater();
 
   // Registration can be before or after cus->Start() so it is ok to post
   // 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)
   g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(
       cus, command_line);
 #endif
 
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
   RegisterWidevineCdmComponent(cus);
 #endif
 
 #if !defined(OS_CHROMEOS)
   // CRLSetFetcher attempts to load a CRL set from either the local disk or
   // network.
   if (!command_line.HasSwitch(switches::kDisableCRLSets))
     g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
 #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)) {

[blundell, 2014/06/17 17:26:42]

Maybe the CLD-related constants should be moved into the translate component?

[tommycli, 2014/06/17 19:01:57]

This particular one would be tricky. Current definition of
chrome::DIR_COMPONENT_CLD2 is chrome::DIR_USER_DATA + "/CLD".

One alternative we could do is to eliminate the DIR_COMPONENT_CLD2 entirely, and
have CldComponentInstallerTraits take the user data dir as an argument, and
simply append /CLD in its implementation.

+    RegisterCldComponent(cus, cld2_base_dir,
+                         base::FilePath(chrome::kCLDDataFilename));
+  }
 #endif
 
   cus->Start();
 }
 
 #if !defined(OS_ANDROID)
 bool ProcessSingletonNotificationCallback(
     const CommandLine& command_line,
     const base::FilePath& current_directory) {
   // Drop the request if the browser process is already in shutdown path.
@@ skipping 1233 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif
 #endif
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }