Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/util/util_constants.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.
 
 #include "chrome/installer/util/util_constants.h"
 
 namespace installer {
 
 namespace switches {
 
@@ skipping 76 matching lines @@
 
 // If present, specify file path to write logging info.
 const char kLogFile[] = "log-file";
 
 // Register Chrome as default browser on the system. Usually this will require
 // that setup is running as admin. If running as admin we try to register
 // as default browser at system level, if running as non-admin we try to
 // register as default browser only for the current user.
 const char kMakeChromeDefault[] = "make-chrome-default";
 
-// Migrate multi-install Chrome Frame to single-install. Use in conjunction with
-// --uncompressed-archive.
-const char kMigrateChromeFrame[] = "migrate-chrome-frame";
-
 // Tells installer to expect to be run as a subsidiary to an MSI.
 const char kMsi[] = "msi";
 
 // Tells installer to install multiple products specified on the command line.
 // (e.g. Chrome Frame, Chrome)
 const char kMultiInstall[] = "multi-install";
 
 // Useful only when used with --update-setup-exe, otherwise ignored. It
 // specifies the full path where updated setup.exe will be stored.
 const char kNewSetupExe[] = "new-setup-exe";
@@ skipping 149 matching lines @@
 const wchar_t kChromeChannelDev[] = L"dev";
 const wchar_t kChromeChannelBeta[] = L"beta";
 const wchar_t kChromeChannelStable[] = L"";
 
 const size_t kMaxAppModelIdLength = 64U;
 
 const char kCourgette[] = "courgette";
 const char kBsdiff[] = "bsdiff";
 
 }  // namespace installer