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

chrome/installer/setup/setup_main.cc

 // Copyright (c) 2009 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.
 
 #include <string>
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 580 matching lines @@
                                      system_install);
   // If --uninstall option is not specified, we assume it is install case.
   } else {
     install_status = InstallChrome(parsed_command_line,
                                    installed_version.get(),
                                    prefs.get());
   }
 
   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;
   }
 
   CoUninitialize();
   return dist->GetInstallReturnCode(install_status);
 }