Have the component build use the same manifest tricks for the installer archive that are now used b…

chrome/installer/setup/install_worker.cc

Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index d98767055d5dd869367fd6bd4bb8b651a8ec4867..8819d4da031ac0c372a6117f1070cac612c4bf71 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -534,20 +534,13 @@ void AddChromeWorkItems(const InstallationState& original_state,
         temp_path);
   }
 
-  // For the component build to work with the installer, we need to drop a
-  // config file and a manifest by chrome.exe. These files are only found in
-  // the archive if this is a component build.
+  // For the component build to work with the installer, we need to also drop
+  // chrome.exe.manifest (other manifests are already contained in the version
+  // directory in the archive so no explicit work is required for them).
 #if defined(COMPONENT_BUILD)
-  static const base::FilePath::CharType kChromeExeConfig[] =
-      FILE_PATH_LITERAL("chrome.exe.config");
   static const base::FilePath::CharType kChromeExeManifest[] =
       FILE_PATH_LITERAL("chrome.exe.manifest");
   install_list->AddMoveTreeWorkItem(
-      src_path.Append(kChromeExeConfig).value(),
-      target_path.Append(kChromeExeConfig).value(),
-      temp_path.value(),
-      WorkItem::ALWAYS_MOVE);
-  install_list->AddMoveTreeWorkItem(
       src_path.Append(kChromeExeManifest).value(),
       target_path.Append(kChromeExeManifest).value(),
       temp_path.value(),