Add multi install support to MasterPreferences and start using it in a few places.I'm also adding a constant for CEEE - I named it kCeee instead of kEnableCeee since it's also used in uninstalls.This change is just a beginning of being aware of having more than one product available in setup.

I added some todos and dcheck for myself to keep track of places that will need more significant changes when running multiple installs.

BUG=61609
TEST=All installations (chrome, chrome frame, ceee) should work as before with the exception that the CEEE switch is now --ceee and not --enable-ceee.

Review URL: http://codereview.chromium.org/4635006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65855 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 10 deletions

diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index d5fe07d..74b4e9f 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -138,17 +138,8 @@ bool InstallUtil::IsPerUserInstall(const wchar_t* const exe_path) {
 }
 
 bool InstallUtil::IsChromeFrameProcess() {
-  FilePath module_path;
-  PathService::Get(base::FILE_MODULE, &module_path);
-  std::wstring module_name(module_path.BaseName().value());
-
   const MasterPreferences& prefs = GetMasterPreferencesForCurrentProcess();
-  bool is_cf = false;
-  prefs.GetBool(installer_util::master_preferences::kChromeFrame, &is_cf);
-
-  // Also assume this to be a ChromeFrame process if we are running inside
-  // the Chrome Frame DLL.
-  return is_cf || module_name == installer_util::kChromeFrameDll;
+  return prefs.install_chrome_frame();
 }
 
 bool InstallUtil::IsChromeSxSProcess() {