Remove remaining references to CEEE.

chrome/installer/util/master_preferences.cc

Index: chrome/installer/util/master_preferences.cc
===================================================================
--- chrome/installer/util/master_preferences.cc	(revision 114621)
+++ chrome/installer/util/master_preferences.cc	(working copy)
@@ -80,7 +80,6 @@
 
 MasterPreferences::MasterPreferences() : distribution_(NULL),
                                          preferences_read_from_file_(false),
-                                         ceee_(false),
                                          chrome_(true),
                                          chrome_frame_(false),
                                          multi_install_(false) {
@@ -90,7 +89,6 @@
 MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
     : distribution_(NULL),
       preferences_read_from_file_(false),
-      ceee_(false),
       chrome_(true),
       chrome_frame_(false),
       multi_install_(false) {
@@ -98,7 +96,7 @@
 }
 
 MasterPreferences::MasterPreferences(const FilePath& prefs_path)
-    : distribution_(NULL), preferences_read_from_file_(false), ceee_(false),
+    : distribution_(NULL), preferences_read_from_file_(false),
       chrome_(true), chrome_frame_(false), multi_install_(false) {
   master_dictionary_.reset(ParseDistributionPreferences(prefs_path));
 
@@ -137,8 +135,6 @@
   } translate_switches[] = {
     { installer::switches::kAutoLaunchChrome,
       installer::master_preferences::kAutoLaunchChrome },
-    { installer::switches::kCeee,
-      installer::master_preferences::kCeee },
     { installer::switches::kChrome,
       installer::master_preferences::kChrome },
     { installer::switches::kChromeFrame,
@@ -212,12 +208,10 @@
   // Make sure we start out with the correct defaults.
   multi_install_ = false;
   chrome_frame_ = false;
-  ceee_ = false;
   chrome_ = true;
 
   GetBool(installer::master_preferences::kMultiInstall, &multi_install_);
   GetBool(installer::master_preferences::kChromeFrame, &chrome_frame_);
-  GetBool(installer::master_preferences::kCeee, &ceee_);
 
   // When multi-install is specified, the checks are pretty simple (in theory):
   // In order to be installed/uninstalled, each product must have its switch
@@ -225,15 +219,7 @@
   // Before multi-install was introduced however, we only supported installing
   // two products, Chrome and Chrome Frame.  For the time being we need to
   // continue to support this mode where multi-install is not set.
-  // So, when multi-install is not set, we continue to support mutually
-  // exclusive installation of Chrome and Chrome Frame in addition to supporting

[mad-corp, 2011/12/15 19:45:37]

Don't we want to keep the first part of the sentence? Isn't it ceee agnostic? In
doubt, maybe check with Robert Shield?

[grt (UTC plus 2), 2011/12/16 04:24:52]

Yes, please keep the first part (up to "...and Chrome Frame").  Thanks for
catching this, MAD.

[Roger Tawa OOO till Jul 10th, 2011/12/16 16:24:30]

Done.

[Roger Tawa OOO till Jul 10th, 2011/12/16 16:24:30]

Done.

-  // installation of CEEE with Chrome Frame.
 
-  // Regardless of multi install being present, CEEE always needs CF to
-  // be installed.
-  if (ceee_)
-    chrome_frame_ = true;
-
   if (multi_install_) {
     if (!GetBool(installer::master_preferences::kChrome, &chrome_))
       chrome_ = false;