Cleaning up after the initial Chrome Frame commit.

chrome/installer/setup/install.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 <shlobj.h>
 #include <time.h>
 
 #include "chrome/installer/setup/install.h"
 
 #include "base/file_util.h"
@@ skipping 77 matching lines @@
                                    const std::wstring& new_version,
                                    WorkItemList* install_list) {
   std::wstring uninstall_cmd(L"\"");
   uninstall_cmd.append(installer::GetInstallerPathUnderChrome(install_path,
                                                               new_version));
   file_util::AppendToPath(&uninstall_cmd,
                           file_util::GetFilenameFromPath(exe_path));
   uninstall_cmd.append(L"\" --");
   uninstall_cmd.append(installer_util::switches::kUninstall);
 
-#ifdef CHROME_EXP_BUILD
+#ifdef CHROME_FRAME_BUILD
   uninstall_cmd.append(L" --");
   uninstall_cmd.append(installer_util::switches::kForceUninstall);
   uninstall_cmd.append(L" --");
   uninstall_cmd.append(installer_util::switches::kDeleteProfile);
 #endif
 
   if (reg_root == HKEY_LOCAL_MACHINE) {
     uninstall_cmd.append(L" --");
     uninstall_cmd.append(installer_util::switches::kSystemLevel);
   }
@@ skipping 130 matching lines @@
       (file_util::PathExists(uninstall_link))) {
     if (!file_util::PathExists(shortcut_path))
       file_util::CreateDirectoryW(shortcut_path);
     std::wstring setup_exe(installer::GetInstallerPathUnderChrome(install_path,
                                                                   new_version));
     file_util::AppendToPath(&setup_exe,
                             file_util::GetFilenameFromPath(exe_path));
     std::wstring arguments(L" --");
     arguments.append(installer_util::switches::kUninstall);
 
-#ifdef CHROME_EXP_BUILD
+#ifdef CHROME_FRAME_BUILD
     arguments.append(L" --");
     arguments.append(installer_util::switches::kForceUninstall);
     arguments.append(L" --");
     arguments.append(installer_util::switches::kDeleteProfile);
 #endif
 
     if (system_install) {
       arguments.append(L" --");
       arguments.append(installer_util::switches::kSystemLevel);
     }
@@ skipping 366 matching lines @@
     }
 
     std::wstring latest_version_to_keep(new_version.GetString());
     if (!current_version.empty())
       latest_version_to_keep.assign(current_version);
     RemoveOldVersionDirs(install_path, latest_version_to_keep);
   }
 
   return result;
 }