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

chrome/browser/sandbox_policy.cc

Index: chrome/browser/sandbox_policy.cc
===================================================================
--- chrome/browser/sandbox_policy.cc	(revision 30960)
+++ chrome/browser/sandbox_policy.cc	(working copy)
@@ -364,6 +364,13 @@
   }
 #endif
 
+  // Propagate the Chrome Frame flag to sandboxed processes if present.
+  if (browser_command_line.HasSwitch(switches::kChromeFrame)) {
+    if (!cmd_line->HasSwitch(switches::kChromeFrame)) {
+      cmd_line->AppendSwitch(switches::kChromeFrame);
+    }
+  }
+
   bool child_needs_help =
       DebugFlags::ProcessDebugFlags(cmd_line, type, in_sandbox);