Continue to remove CHROME_FRAME_BUILD define from code that goes into chrome....

chrome/installer/setup/setup_main.cc

Index: chrome/installer/setup/setup_main.cc
===================================================================
--- chrome/installer/setup/setup_main.cc	(revision 30960)
+++ chrome/installer/setup/setup_main.cc	(working copy)
@@ -598,18 +598,18 @@
 
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
 
-#if defined(CHROME_FRAME_BUILD)
-  if (install_status == installer_util::UNINSTALL_REQUIRES_REBOOT) {
-    ShowRebootDialog();
-  } else if (parsed_command_line.HasSwitch(
-      installer_util::switches::kUninstall)) {
-    ::MessageBoxW(NULL,
-                  installer_util::GetLocalizedString(
-                      IDS_UNINSTALL_COMPLETE_BASE).c_str(),
-                  dist->GetApplicationName().c_str(),
-                  MB_OK);
+  if (InstallUtil::IsChromeFrameProcess()) {
+    if (install_status == installer_util::UNINSTALL_REQUIRES_REBOOT) {
+      ShowRebootDialog();
+    } else if (parsed_command_line.HasSwitch(
+        installer_util::switches::kUninstall)) {
+      ::MessageBoxW(NULL,
+                    installer_util::GetLocalizedString(
+                        IDS_UNINSTALL_COMPLETE_BASE).c_str(),
+                    dist->GetApplicationName().c_str(),
+                    MB_OK);
+    }
   }
-#endif
 
   if (install_status == installer_util::UNINSTALL_REQUIRES_REBOOT) {
     install_status = installer_util::UNINSTALL_SUCCESSFUL;