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

chrome/installer/setup/uninstall.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.
 //
 // This file defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 161 matching lines @@
   if (!file_util::CreateTemporaryFile(&temp_file)) {
     LOG(ERROR) << "Failed to create temporary file for setup.exe.";
   } else {
     FilePath setup_exe_path = FilePath::FromWStringHack(setup_exe);
     file_util::Move(setup_exe_path, temp_file);
   }
 
   // Obtain the location of the user profile data. Chrome Frame needs to
   // build this path manually since it doesn't use the Chrome default dir.
   FilePath user_local_state;
-#if defined(CHROME_FRAME_BUILD)
-  bool got_local_state =
-      chrome::GetChromeFrameUserDataDirectory(&user_local_state);
-#else  // if !defined(CHROME_FRAME_BUILD)
-  bool got_local_state = chrome::GetDefaultUserDataDirectory(&user_local_state);
-#endif
+  bool got_local_state = false;
+  if (InstallUtil::IsChromeFrameProcess()) {
+    got_local_state =
+        chrome::GetChromeFrameUserDataDirectory(&user_local_state);
+  } else {
+    got_local_state = chrome::GetDefaultUserDataDirectory(&user_local_state);
+  }
 
   // Move the browser's persisted local state
   if (got_local_state) {
     FilePath user_local_file(
         user_local_state.Append(chrome::kLocalStateFilename));
     FilePath path = FilePath::FromWStringHack(*local_state_path);
     if (!file_util::CreateTemporaryFile(&path))
       LOG(ERROR) << "Failed to create temporary file for Local State.";
     else
       file_util::CopyFile(user_local_file, path);
   } else {
     LOG(ERROR) << "Could not retrieve user's profile directory.";
   }
 
   DeleteResult result = DELETE_SUCCEEDED;
 
   LOG(INFO) << "Deleting install path " << install_path;
   if (!file_util::Delete(install_path, true)) {
     LOG(ERROR) << "Failed to delete folder (1st try): " << install_path;
-#if defined(CHROME_FRAME_BUILD)
-    // We don't try killing Chrome processes for Chrome Frame builds since
-    // that is unlikely to help. Instead, schedule files for deletion and
-    // return a value that will trigger a reboot prompt.
-    ScheduleDirectoryForDeletion(install_path.c_str());
-    result = DELETE_REQUIRES_REBOOT;
-#else
-    // Try closing any running chrome processes and deleting files once again.
-    CloseAllChromeProcesses();
-    if (!file_util::Delete(install_path, true)) {
-      LOG(ERROR) << "Failed to delete folder (2nd try): " << install_path;
-      result = DELETE_FAILED;
+    if (InstallUtil::IsChromeFrameProcess()) {
+      // We don't try killing Chrome processes for Chrome Frame builds since
+      // that is unlikely to help. Instead, schedule files for deletion and
+      // return a value that will trigger a reboot prompt.
+      ScheduleDirectoryForDeletion(install_path.c_str());
+      result = DELETE_REQUIRES_REBOOT;
+    } else {
+      // Try closing any running chrome processes and deleting files once again.
+      CloseAllChromeProcesses();
+      if (!file_util::Delete(install_path, true)) {
+        LOG(ERROR) << "Failed to delete folder (2nd try): " << install_path;
+        result = DELETE_FAILED;
+      }
     }
-#endif
   }
 
   if (delete_profile && got_local_state) {
     LOG(INFO) << "Deleting user profile" << user_local_state.value();
     if (!file_util::Delete(user_local_state, true)) {
       LOG(ERROR) << "Failed to delete user profile dir: "
                  << user_local_state.value();
-#if defined(CHROME_FRAME_BUILD)
-      ScheduleDirectoryForDeletion(user_local_state.value().c_str());
-      result = DELETE_REQUIRES_REBOOT;
-#else
-      result = DELETE_FAILED;
-#endif
+      if (InstallUtil::IsChromeFrameProcess()) {
+        ScheduleDirectoryForDeletion(user_local_state.value().c_str());
+        result = DELETE_REQUIRES_REBOOT;
+      } else {
+        result = DELETE_FAILED;
+      }
     }
     DeleteEmptyParentDir(user_local_state.value());
   }
 
   // Now check and delete if the parent directories are empty
   // For example Google\Chrome or Chromium
   DeleteEmptyParentDir(install_path);
   return result;
 }
 
@@ skipping 156 matching lines @@
     bool remove_all, bool force_uninstall,
     const CommandLine& cmd_line, const wchar_t* cmd_params) {
   installer_util::InstallStatus status = installer_util::UNINSTALL_CONFIRMED;
   std::wstring suffix;
   if (!ShellUtil::GetUserSpecificDefaultBrowserSuffix(&suffix))
     suffix = L"";
 
   if (force_uninstall) {
     // Since --force-uninstall command line option is used, we are going to
     // do silent uninstall. Try to close all running Chrome instances.
-#if !defined(CHROME_FRAME_BUILD)
-    CloseAllChromeProcesses();
-#endif
+    if (!InstallUtil::IsChromeFrameProcess())
+      CloseAllChromeProcesses();
   } else {  // no --force-uninstall so lets show some UI dialog boxes.
     status = IsChromeActiveOrUserCancelled(system_uninstall);
     if (status != installer_util::UNINSTALL_CONFIRMED &&
         status != installer_util::UNINSTALL_DELETE_PROFILE)
       return status;
 
     // Check if we need admin rights to cleanup HKLM. If we do, try to launch
     // another uninstaller (silent) in elevated mode to do HKLM cleanup.
     // And continue uninstalling in the current process also to do HKCU cleanup.
     if (remove_all &&
@@ skipping 102 matching lines @@
                                     distribution_data);
   }
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!local_state_path.empty())
     file_util::Delete(local_state_path, false);
 
   return ret;
 }