Implement support in DefaultComponentInstaller for picking up bundled

components/component_updater/component_updater_paths.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_COMPONENT_UPDATER_COMPONENT_UPDATER_PATHS_H_
 #define COMPONENTS_COMPONENT_UPDATER_COMPONENT_UPDATER_PATHS_H_
 
 #include "base/files/file_path.h"
 
 namespace component_updater {
 
 enum {
   PATH_START = 10000,
-  DIR_COMPONENT_CLD2 = PATH_START,  // Directory that contains component-updated
-                                    // Compact Language Detector files.
-  DIR_RECOVERY_BASE,                // Full path to the dir for Recovery
-                                    // component.
-  DIR_SWIFT_SHADER,                 // Path to the SwiftShader component.
-  DIR_SW_REPORTER,                  // Path to the SwReporter component.
-  DIR_COMPONENT_EV_WHITELIST,       // EV whitelist for CT files.
-  DIR_SUPERVISED_USER_WHITELISTS,   // Supervised user whitelists.
-  DIR_CERT_TRANS_TREE_STATES,       // Signed Tree Heads for CT logs.
-  DIR_ORIGIN_TRIAL_KEYS,            // Public keys and revoked tokens for origin
-                                    // trials.
+  DIR_COMPONENT_SYSTEM = PATH_START,  // Directory that contains system-wide
+                                      // (bundled) component installations.
+  DIR_COMPONENT_USER,                 // Directory that contains user-wide
+                                      // (component-update-delivered) component
+                                      // installations.
+  DIR_RECOVERY_BASE,                  // Full path to the dir for Recovery
+                                      // component.
+  DIR_SWIFT_SHADER,                   // Path to the SwiftShader component.
+  DIR_SUPERVISED_USER_WHITELISTS,     // Supervised user whitelists.
   PATH_END
 };
 
 // Call once to register the provider for the path keys defined above.
-// |components_root_key| is the path provider key defining where the
-// components should be installed.
-void RegisterPathProvider(int components_root_key);
+// |components_system_root_key| is the path provider key defining where bundled
+// components are already installed system-wide.
+// |components_user_root_key| is the path provider key defining where the
+// component updater should install new versions of components.
+void RegisterPathProvider(int components_system_root_key,
+                          int components_user_root_key);
 
 }  // namespace component_updater
 
 #endif  // COMPONENTS_COMPONENT_UPDATER_COMPONENT_UPDATER_PATHS_H_