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 366 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);

[waffles, 2014/06/18 22:30:37]

Can we avoid passing these directories as arguments? (Is there a reason we might
use a different directory on iOS?)

[tommycli, 2014/06/19 00:28:40]

DIR_RECOVERY_BASE is always DIR_USER_DATA/recovery.

We could pass in DIR_USER_DATA, eliminate DIR_RECOVERY_BASE, and have the
recovery component hardcode it to "recovery".

Is that what you were thinking?

+  }

[Sorin Jianu, 2014/06/19 00:48:21]

I second the comment above. It seems we need to have the component paths
available to the components but right now, the directory names are defined as
path service constants somewhere in the "chrome" proper, which we don't want to
depend on. I suggest moving the constants from the chrome_paths.h to some
component_paths.h under src/components. This way, the components would be able
to access their directory paths, and there would be no need to hook up this data
down to Register* functions, then to each component constructor. 

I am not certain this change is possible. But we see that was relatively neat
code before, it is now cluttered with calls to PathService (1 line of code
exploded and it became 5).

[tommycli, 2014/06/23 21:55:28]

Done.

+
   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) && !defined(OS_ANDROID)
   // 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);
 #elif defined(OS_ANDROID)
   // The CRLSet component was enabled for some releases. This code attempts to
   // delete it from the local disk of those how may have downloaded it.
   g_browser_process->crl_set_fetcher()->DeleteFromDisk();
 #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();
 }
 
 #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 1231 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif
 #endif
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }