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

chrome/installer/util/shell_util.cc

Index: chrome/installer/util/shell_util.cc
===================================================================
--- chrome/installer/util/shell_util.cc	(revision 30960)
+++ chrome/installer/util/shell_util.cc	(working copy)
@@ -313,6 +313,13 @@
       params.append(installer_util::switches::kRegisterChromeBrowserSuffix);
       params.append(L"=\"" + suffix + L"\"");
     }
+
+    CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+    if (browser_command_line.HasSwitch(switches::kChromeFrame)) {
+      params.append(L" --");
+      params.append(installer_util::switches::kChromeFrame);
+    }
+
     DWORD ret_val = 0;
     InstallUtil::ExecuteExeAsAdmin(exe_path, params, &ret_val);
     if (ret_val == 0)