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

chrome/browser/first_run_win.cc

Index: chrome/browser/first_run_win.cc
===================================================================
--- chrome/browser/first_run_win.cc	(revision 30960)
+++ chrome/browser/first_run_win.cc	(working copy)
@@ -120,6 +120,12 @@
   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);
@@ -581,6 +587,10 @@
   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))