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

chrome/installer/util/install_util.cc

 // Copyright (c) 2006-2008 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.
 //
 // See the corresponding header file for description of the functions in this
 // file.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <algorithm>
 
+#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/l10n_string_util.h"
+#include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item_list.h"
 
 bool InstallUtil::ExecuteExeAsAdmin(const std::wstring& exe,
                                     const std::wstring& params,
                                     DWORD* exit_code) {
   SHELLEXECUTEINFO info = {0};
   info.cbSize = sizeof(SHELLEXECUTEINFO);
   info.fMask = SEE_MASK_NOCLOSEPROCESS;
   info.lpVerb = L"runas";
   info.lpFile = exe.c_str();
@@ skipping 85 matching lines @@
   wchar_t program_files_path[MAX_PATH] = {0};
   if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL,
                                 SHGFP_TYPE_CURRENT, program_files_path))) {
     return !StartsWith(exe_path, program_files_path, false);
   } else {
     NOTREACHED();
   }
   return true;
 }
 
+bool InstallUtil::IsChromeFrameProcess() {
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  DCHECK(command_line)
+      << "IsChromeFrameProcess() called before ComamandLine::Init()";
+  return command_line->HasSwitch(installer_util::switches::kChromeFrame);
+}
+
 bool InstallUtil::BuildDLLRegistrationList(const std::wstring& install_path,
                                            const wchar_t** const dll_names,
                                            int dll_names_count,
                                            bool do_register,
                                            WorkItemList* registration_list) {
   DCHECK(NULL != registration_list);
   bool success = true;
   for (int i = 0; i < dll_names_count; i++) {
     std::wstring dll_file_path(install_path);
     file_util::AppendToPath(&dll_file_path, dll_names[i]);
     success = registration_list->AddSelfRegWorkItem(dll_file_path,
         do_register) && success;
   }
   return (dll_names_count > 0) && success;
 }