Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/setup/setup_util.cc

 // Copyright (c) 2012 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 declares util functions for setup project.
 
 #include "chrome/installer/setup/setup_util.h"
 
 #include <windows.h>
 
@@ skipping 411 matching lines @@
 
 bool IsUninstallSuccess(InstallStatus install_status) {
   // The following status values represent failed uninstalls:
   // 15: CHROME_NOT_INSTALLED
   // 20: UNINSTALL_FAILED
   // 21: UNINSTALL_CANCELLED
   return (install_status == UNINSTALL_SUCCESSFUL ||
           install_status == UNINSTALL_REQUIRES_REBOOT);
 }
 
+bool ContainsUnsupportedSwitch(const CommandLine& cmd_line) {
+  static const char* const kLegacySwitches[] = {
+    // Chrome Frame ready-mode.
+    "ready-mode",
+    "ready-mode-opt-in",
+    "ready-mode-temp-opt-out",
+    "ready-mode-end-temp-opt-out",
+    // Chrome Frame quick-enable.
+    "quick-enable-cf",
+    // Installation of Chrome Frame.
+    "chrome-frame",
+    "migrate-chrome-frame",
+  };
+  for (size_t i = 0; i < arraysize(kLegacySwitches); ++i) {
+    if (cmd_line.HasSwitch(kLegacySwitches[i]))
+      return true;
+  }
+  return false;
+}
+
 ScopedTokenPrivilege::ScopedTokenPrivilege(const wchar_t* privilege_name)
     : is_enabled_(false) {
   HANDLE temp_handle;
   if (!::OpenProcessToken(::GetCurrentProcess(),
                           TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
                           &temp_handle)) {
     return;
   }
   token_.Set(temp_handle);
 
@@ skipping 21 matching lines @@
 }
 
 ScopedTokenPrivilege::~ScopedTokenPrivilege() {
   if (is_enabled_ && previous_privileges_.PrivilegeCount != 0) {
     ::AdjustTokenPrivileges(token_, FALSE, &previous_privileges_,
                             sizeof(TOKEN_PRIVILEGES), NULL, NULL);
   }
 }
 
 }  // namespace installer