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

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/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/create_reg_key_work_item.h"
 #include "chrome/installer/util/delete_after_reboot_helper.h"
 #include "chrome/installer/util/google_update_constants.h"
@@ skipping 58 matching lines @@
   install_list->AddCopyTreeWorkItem(exe_path, exe_dst, temp_path,
                                     WorkItem::ALWAYS);
   if (system_level) {
     install_list->AddCopyTreeWorkItem(archive_path, archive_dst, temp_path,
                                       WorkItem::ALWAYS);
   } else {
     install_list->AddMoveTreeWorkItem(archive_path, archive_dst, temp_path);
   }
 }
 
+void AppendUninstallCommandLineFlags(std::wstring* uninstall_cmd_line,
+                                     bool is_system) {
+  DCHECK(uninstall_cmd_line);
+  uninstall_cmd_line->append(L" --");
+  uninstall_cmd_line->append(installer_util::switches::kUninstall);
+
+  if (InstallUtil::IsChromeFrameProcess()) {
+    uninstall_cmd_line->append(L" --");
+    uninstall_cmd_line->append(installer_util::switches::kForceUninstall);
+    uninstall_cmd_line->append(L" --");
+    uninstall_cmd_line->append(installer_util::switches::kDeleteProfile);
+    uninstall_cmd_line->append(L" --");
+    uninstall_cmd_line->append(installer_util::switches::kChromeFrame);
+  }
+
+  // Propagate the verbose logging switch to uninstalls too.
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(installer_util::switches::kVerboseLogging)) {
+    uninstall_cmd_line->append(L" --");
+    uninstall_cmd_line->append(installer_util::switches::kVerboseLogging);
+  }
+
+  if (is_system) {
+    uninstall_cmd_line->append(L" --");
+    uninstall_cmd_line->append(installer_util::switches::kSystemLevel);
+  }
+}
+
 // This method adds work items to create (or update) Chrome uninstall entry in
 // Control Panel->Add/Remove Programs list.
 void AddUninstallShortcutWorkItems(HKEY reg_root,
                                    const std::wstring& exe_path,
                                    const std::wstring& install_path,
                                    const std::wstring& product_name,
                                    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);
+  uninstall_cmd.append(L"\"");
 
-#if defined(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);
-  }
+  AppendUninstallCommandLineFlags(&uninstall_cmd,
+                                  reg_root == HKEY_LOCAL_MACHINE);
 
   // Create DisplayName, UninstallString and InstallLocation keys
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring uninstall_reg = dist->GetUninstallRegPath();
   install_list->AddCreateRegKeyWorkItem(reg_root, uninstall_reg);
   install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
       installer_util::kUninstallDisplayNameField, product_name, true);
   install_list->AddSetRegValueWorkItem(reg_root,
                                        uninstall_reg,
                                        installer_util::kUninstallStringField,
@@ skipping 118 matching lines @@
       dist->GetUninstallLinkName() + L".lnk");
   if ((install_status == installer_util::FIRST_INSTALL_SUCCESS) ||
       (install_status == installer_util::INSTALL_REPAIRED) ||
       (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);
 
-#if defined(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);
-    }
+    std::wstring arguments;
+    AppendUninstallCommandLineFlags(&arguments, system_install);
 
     LOG(INFO) << "Creating/updating uninstall link at "
               << uninstall_link.value();
     ret = ret && file_util::CreateShortcutLink(setup_exe.c_str(),
                                                uninstall_link.value().c_str(),
                                                NULL,
                                                arguments.c_str(),
                                                NULL, setup_exe.c_str(), 0);
   }
 
@@ skipping 182 matching lines @@
                        const std::wstring& archive_path,
                        const std::wstring& src_path,
                        const std::wstring& install_path,
                        const std::wstring& temp_dir,
                        const HKEY reg_root,
                        const installer::Version& new_version,
                        std::wstring* current_version) {
   if (reg_root != HKEY_LOCAL_MACHINE && reg_root != HKEY_CURRENT_USER)
     return false;
 
-#if defined(CHROME_FRAME_BUILD)
-  // Make sure that we don't end up deleting installed files on next reboot.
-  if (!RemoveFromMovesPendingReboot(install_path.c_str())) {
-    LOG(ERROR) << "Error accessing pending moves value.";
+  if (InstallUtil::IsChromeFrameProcess()) {
+    // Make sure that we don't end up deleting installed files on next reboot.
+    if (!RemoveFromMovesPendingReboot(install_path.c_str())) {
+      LOG(ERROR) << "Error accessing pending moves value.";
+    }
   }
-#endif
 
   scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList());
   // A temp directory that work items need and the actual install directory.
   install_list->AddCreateDirWorkItem(FilePath::FromWStringHack(temp_dir));
   install_list->AddCreateDirWorkItem(FilePath::FromWStringHack(install_path));
 
   // If it is system level install copy the version folder (since we want to
   // take the permissions of %ProgramFiles% folder) otherwise just move it.
   if (reg_root == HKEY_LOCAL_MACHINE) {
     install_list->AddCopyTreeWorkItem(
@@ skipping 164 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;
 }