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

chrome/browser/utility_process_host.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 "chrome/browser/utility_process_host.h"
 
 #include "app/app_switches.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 79 matching lines @@
   cmd_line.AppendSwitchWithValue(switches::kProcessType,
                                  switches::kUtilityProcess);
   cmd_line.AppendSwitchWithValue(switches::kProcessChannelID,
                                  ASCIIToWide(channel_id()));
   // Pass on the browser locale.
   std::string locale = l10n_util::GetApplicationLocale(L"");
   cmd_line.AppendSwitchWithValue(switches::kLang, ASCIIToWide(locale));
 
   SetCrashReporterCommandLine(&cmd_line);
 
+  const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+  if (browser_command_line.HasSwitch(switches::kChromeFrame)) {
+    cmd_line.AppendSwitch(switches::kChromeFrame);
+  }
+
   base::ProcessHandle process;
 #if defined(OS_WIN)
   if (!UseSandbox()) {
     // Don't use the sandbox during unit tests.
     base::LaunchApp(cmd_line, false, false, &process);
   } else if (exposed_dir.empty()) {
     process = sandbox::StartProcess(&cmd_line);
   } else {
     process = sandbox::StartProcessWithAccess(&cmd_line, exposed_dir);
   }
 #else
   // TODO(port): Sandbox this on Linux/Mac.  Also, zygote this to work with
   // Linux updating.
-  const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   bool has_cmd_prefix = browser_command_line.HasSwitch(
       switches::kUtilityCmdPrefix);
   if (has_cmd_prefix) {
     // launch the utility child process with some prefix (usually "xterm -e gdb
     // --args").
     cmd_line.PrependWrapper(browser_command_line.GetSwitchValue(
         switches::kUtilityCmdPrefix));
   }
 
   // This code is duplicated with browser_render_process_host.cc and
@@ skipping 40 matching lines @@
     IPC_MESSAGE_HANDLER(UtilityHostMsg_UnpackWebResource_Succeeded,
                         Client::OnUnpackWebResourceSucceeded)
     IPC_MESSAGE_HANDLER(UtilityHostMsg_UnpackWebResource_Failed,
                         Client::OnUnpackWebResourceFailed)
     IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseUpdateManifest_Succeeded,
                         Client::OnParseUpdateManifestSucceeded)
     IPC_MESSAGE_HANDLER(UtilityHostMsg_ParseUpdateManifest_Failed,
                         Client::OnParseUpdateManifestFailed)
   IPC_END_MESSAGE_MAP_EX()
 }