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

chrome/browser/first_run_win.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/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 102 matching lines @@
 bool LaunchSetupWithParam(const std::string& param, const std::wstring& value,
                           int* ret_code) {
   FilePath exe_path;
   if (!PathService::Get(base::DIR_MODULE, &exe_path))
     return false;
   exe_path = exe_path.Append(installer_util::kInstallerDir);
   exe_path = exe_path.Append(installer_util::kSetupExe);
   base::ProcessHandle ph;
   CommandLine cl(exe_path);
   cl.AppendSwitchWithValue(param, value);
+
+  CommandLine* browser_command_line = CommandLine::ForCurrentProcess();
+  if (browser_command_line->HasSwitch(switches::kChromeFrame)) {
+    cl.AppendSwitch(switches::kChromeFrame);
+  }
+
   if (!base::LaunchApp(cl, false, false, &ph))
     return false;
   DWORD wr = ::WaitForSingleObject(ph, INFINITE);
   if (wr != WAIT_OBJECT_0)
     return false;
   return (TRUE == ::GetExitCodeProcess(ph, reinterpret_cast<DWORD*>(ret_code)));
 }
 
 bool WriteEULAtoTempFile(FilePath* eula_path) {
   std::string terms =
@@ skipping 441 matching lines @@
   // Since ImportSettings is called before the local state is stored on disk
   // we pass the language as an argument.  GetApplicationLocale checks the
   // current command line as fallback.
   import_cmd.AppendSwitchWithValue(
       switches::kLang,
       ASCIIToWide(g_browser_process->GetApplicationLocale()));
 
   import_cmd.CommandLine::AppendSwitchWithValue(switches::kImport,
       EncodeImportParams(browser_type, items_to_import, parent_window));
 
+  if (cmdline.HasSwitch(switches::kChromeFrame)) {
+    import_cmd.AppendSwitch(switches::kChromeFrame);
+  }
+
   // Time to launch the process that is going to do the import.
   base::ProcessHandle import_process;
   if (!base::LaunchApp(import_cmd, false, false, &import_process))
     return false;
 
   // Activate the importer monitor. It awakes periodically in another thread
   // and checks that the importer UI is still pumping messages.
   if (parent_window)
     HungImporterMonitor hang_monitor(parent_window, import_process);
 
@@ skipping 355 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TryChromeDialog);
 };
 
 }  // namespace
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   TryChromeDialog td(version);
   return td.ShowModal();
 }