Make setup.exe compatible with the component build.

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 74d9a8f68b1c278f022f2b8e296ed363ebf3eaea..7d2f5e0e7921e2d3d676348fe038d106b7f90008 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -794,6 +794,24 @@ void AddInstallWorkItems(const InstallationState& original_state,
         temp_path);
   }
 
+  // For the component build to work with the installer, we need to drop a

[gab, 2012/05/09 01:34:20]

It would be nice to #ifdef to code below to make sure it doesn't clutter the
release setup binary, but I wasn't sure what to ifdef on...

[grt (UTC plus 2), 2012/05/09 15:49:40]

#if defined(COMPONENT_BUILD)

[gab, 2012/05/09 21:13:24]

Done.

+  // config file and a manifest by chrome.exe. These files are only found in
+  // the archive if this is a component build.
+  static const wchar_t kChromeExeConfig[] = L"chrome.exe.config";

[grt (UTC plus 2), 2012/05/09 15:49:40]

this is the portable way to do literals that go into FilePaths:
static const FilePath::CharType kFooBar[] = FILE_PATH_LITERAL("FooBar");

[gab, 2012/05/09 21:13:24]

Done.

+  static const wchar_t kChromeExeManifest[] = L"chrome.exe.manifest";
+  if (file_util::PathExists(src_path.Append(kChromeExeManifest))) {
+    install_list->AddMoveTreeWorkItem(
+      src_path.Append(kChromeExeConfig).value(),

[grt (UTC plus 2), 2012/05/09 15:49:40]

nit: indentation

[gab, 2012/05/09 21:13:24]

Done.

+      target_path.Append(kChromeExeConfig).value(),
+      temp_path.value(),
+      WorkItem::ALWAYS_MOVE);
+    install_list->AddMoveTreeWorkItem(
+      src_path.Append(kChromeExeManifest).value(),

[grt (UTC plus 2), 2012/05/09 15:49:40]

nit: indentation

[gab, 2012/05/09 21:13:24]

Done.

+      target_path.Append(kChromeExeManifest).value(),
+      temp_path.value(),
+      WorkItem::ALWAYS_MOVE);
+  }
+
   // In the past, we copied rather than moved for system level installs so that
   // the permissions of %ProgramFiles% would be picked up.  Now that |temp_path|
   // is in %ProgramFiles% for system level installs (and in %LOCALAPPDATA%