Revert of Remove installation of Chrome Frame.

Revert of https://codereview.chromium.org/117433002/
Reason for revert: Reverting this change just to confirm that sizes change is triggered by it.

TBR=robertshield@chromium.org,gab@chromium.org,grt@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=316496

[Nikita (slow), 2013-12-24 13:22:54]

Created Revert of Remove installation of Chrome Frame.

[commit-bot: I haz the power, 2013-12-24 13:23:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nkostylev@chromium.org/115993006/1

[commit-bot: I haz the power, 2013-12-24 13:23:16]

Failed to apply patch for chrome/installer/setup/install.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/installer/setup/install.cc
  Hunk #1 FAILED at 506.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/installer/setup/install.cc.rej

Patch:       chrome/installer/setup/install.cc
Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc
b/chrome/installer/setup/install.cc
index
707fae9be4b0639b198296ce5eddee874ae902d3..66c081aa0dec774b97337ef64957b9f649ff9e2a
100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -506,15 +506,17 @@
     const base::FilePath& prefs_path,
     const MasterPreferences& prefs,
     const Version& new_version) {
-  DCHECK(!installer_state.products().empty());
-
   // TODO(robertshield): Removing the pending on-reboot moves should be done
   // elsewhere.
-  // Remove any scheduled MOVEFILE_DELAY_UNTIL_REBOOT entries in the target of
-  // this installation. These may have been added during a previous uninstall
of
-  // the same version.
-  LOG_IF(ERROR, !RemoveFromMovesPendingReboot(installer_state.target_path()))
-      << "Error accessing pending moves value.";
+  // TODO(erikwright): Understand why this is Chrome Frame only and whether
+  // it also applies to App Host. Shouldn't it apply to any multi-install too?
+  const Products& products = installer_state.products();
+  DCHECK(products.size());
+  if (installer_state.FindProduct(BrowserDistribution::CHROME_FRAME)) {
+    // Make sure that we don't end up deleting installed files on next reboot.
+    if (!RemoveFromMovesPendingReboot(installer_state.target_path()))
+      LOG(ERROR) << "Error accessing pending moves value.";
+  }
 
   // Create VisualElementManifest.xml in |src_path| (if required) so that it
   // looks as if it had been extracted from the archive when calling

[Nikita (slow), 2013-12-24 13:26:16]

Please ignore this test revert.
It is not applying cleanly so I'll just abandon it.