Add awareness of the CEEE broker to BrowserDistribution. If the code called is inside the Broker, behave as if it was ChromeFrame.

BUG=None
TEST=None

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

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

3 files changed, 12 insertions, 1 deletions

diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 2bb6716..2e2ccf2 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -33,11 +33,20 @@ bool IsChromeFrameModule() {
                                           installer_util::kChromeFrameDll);
 }
 
+// Returns true if currently running in ceee_broker.exe
+bool IsCeeeBrokerProcess() {
+  FilePath exe_path;
+  PathService::Get(base::FILE_EXE, &exe_path);
+  return FilePath::CompareEqualIgnoreCase(exe_path.BaseName().value(),
+                                          installer_util::kCeeeBrokerExe);
+}
+
 }  // end namespace
 
 BrowserDistribution* BrowserDistribution::GetDistribution() {
   return GetDistribution(InstallUtil::IsChromeFrameProcess() ||
-                         IsChromeFrameModule());
+                         IsChromeFrameModule() ||
+                         IsCeeeBrokerProcess());
 }
 
 BrowserDistribution* BrowserDistribution::GetDistribution(bool chrome_frame) {
diff --git a/chrome/installer/util/util_constants.cc b/chrome/installer/util/util_constants.cc
index 04df035..66a0636 100644
--- a/chrome/installer/util/util_constants.cc
+++ b/chrome/installer/util/util_constants.cc
@@ -131,6 +131,7 @@ const char kToastResultsKey[] = "toast-results-key";
 
 }  // namespace switches
 
+const wchar_t kCeeeBrokerExe[] = L"ceee_broker.exe";
 const wchar_t kChromeDll[] = L"chrome.dll";
 const wchar_t kChromeExe[] = L"chrome.exe";
 const wchar_t kChromeFrameDll[] = L"npchrome_frame.dll";
diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index db53573..7cc4042 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -87,6 +87,7 @@ extern const char kSystemLevelToast[];
 extern const char kToastResultsKey[];
 }  // namespace switches
 
+extern const wchar_t kCeeeBrokerExe[];
 extern const wchar_t kChromeDll[];
 extern const wchar_t kChromeExe[];
 extern const wchar_t kChromeFrameDll[];