Make setup.exe compatible with the component build.

chrome/installer/setup/install_worker.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.
 //
 // This file contains the definitions of the installer functions that build
 // the WorkItemList used to install the application.
 
 #include "chrome/installer/setup/install_worker.h"
 
 #include <oaidl.h>
@@ skipping 776 matching lines @@
         temp_path.value(),
         WorkItem::ALWAYS_MOVE);
   } else {
     // We do not want to have an old VisualElementsManifest pointing to an old
     // version directory. Delete it as there wasn't a new one to replace it.
     install_list->AddDeleteTreeWorkItem(
         target_path.Append(installer::kVisualElementsManifest),
         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%
   // otherwise), there is no need to do this.
   // Note that we pass true for check_duplicates to avoid failing on in-use
   // repair runs if the current_version is the same as the new_version.
   bool check_for_duplicates =
       (current_version != NULL && current_version->get() != NULL &&
        current_version->get()->Equals(new_version));
   install_list->AddMoveTreeWorkItem(
@@ skipping 598 matching lines @@
     } else {
       DCHECK(operation == REMOVE_COMMAND);
       work_item_list->AddDeleteRegKeyWorkItem(installer_state.root_key(),
                                               cmd_key)->set_log_message(
           "removing quick-enable-cf command");
     }
   }
 }
 
 }  // namespace installer