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

chrome/browser/sandbox_policy.cc

 // Copyright (c) 2006-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 "chrome/browser/sandbox_policy.h"
 
 #include "app/win_util.h"
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "base/file_util.h"
@@ skipping 346 matching lines @@
       !browser_command_line.HasSwitch(switches::kNoSandbox) &&
       (type != ChildProcessInfo::PLUGIN_PROCESS ||
        browser_command_line.HasSwitch(switches::kSafePlugins));
 #if !defined (GOOGLE_CHROME_BUILD)
   if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) {
     // In process plugins won't work if the sandbox is enabled.
     in_sandbox = false;
   }
 #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);
 
   if (!in_sandbox) {
     base::LaunchApp(*cmd_line, false, false, &process);
     return process;
   }
 
   // spawn the child process in the sandbox
   sandbox::BrokerServices* broker_service =
@@ skipping 55 matching lines @@
 
   // Help the process a little. It can't start the debugger by itself if
   // the process is in a sandbox.
   if (child_needs_help)
     DebugUtil::SpawnDebuggerOnProcess(target.dwProcessId);
 
   return process;
 }
 
 } // namespace sandbox