Removing the GetVersionEnvKey method from BrowserDistribution.

This function is not used by the installer and since we're moving towards using shared binaries, all components should rely on using the same version env var.  It's also one less thing that the chrome code relies on from the installer code.

TEST=Should be no change.
BUG=61609

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

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

13 files changed, 10 insertions, 36 deletions

diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index 06864a3..d49e78d 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -15,6 +15,7 @@
 #include "base/version.h"
 #include "chrome/app/breakpad_win.h"
 #include "chrome/app/client_util.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ -229,9 +230,8 @@ HMODULE MainDllLoader::Load(std::wstring* out_version, std::wstring* out_file) {
   }
 
   if (!version.get()) {
-    if (EnvQueryStr(
-            BrowserDistribution::GetDistribution()->GetEnvVersionKey().c_str(),
-            &version_env_string)) {
+    if (EnvQueryStr(ASCIIToWide(chrome::kChromeVersionEnvVar).c_str(),
+                    &version_env_string)) {
       version.reset(Version::GetVersionFromString(version_env_string));
     }
   }
@@ -267,9 +267,7 @@ int MainDllLoader::Launch(HINSTANCE instance,
     return ResultCodes::MISSING_DATA;
 
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  env->SetVar(WideToUTF8(
-      BrowserDistribution::GetDistribution()->GetEnvVersionKey()).c_str(),
-      WideToUTF8(version));
+  env->SetVar(chrome::kChromeVersionEnvVar, WideToUTF8(version));
 
   InitCrashReporterWithDllPath(file);
   OnBeforeLaunch();
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index 0971e0d..854c03a 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/first_run_search_engine_view.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
@@ -256,8 +257,7 @@ bool Upgrade::IsBrowserAlreadyRunning() {
 
 bool Upgrade::RelaunchChromeBrowser(const CommandLine& command_line) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  env->UnSetVar(WideToUTF8(
-      BrowserDistribution::GetDistribution()->GetEnvVersionKey()).c_str());
+  env->UnSetVar(chrome::kChromeVersionEnvVar);
   return base::LaunchApp(command_line.command_line_string(),
                          false, false, NULL);
 }
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index e6a3246..9b3a9ba 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -22,6 +22,8 @@
 
 namespace chrome {
 
+const char kChromeVersionEnvVar[] = "CHROME_VERSION";
+
 // The following should not be used for UI strings; they are meant
 // for system strings only. UI changes should be made in the GRD.
 #if defined(OS_WIN)
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index bc4d4bf..ee82ff54 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -14,6 +14,8 @@ namespace chrome {
 
 extern const char kChromeVersion[];
 
+extern const char kChromeVersionEnvVar[];
+
 extern const wchar_t kBrowserProcessExecutableName[];
 extern const wchar_t kHelperProcessExecutableName[];
 extern const wchar_t kBrowserProcessExecutablePath[];
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 232c434..1a82cf5 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -198,10 +198,6 @@ std::wstring BrowserDistribution::GetVersionKey() {
   return L"Software\\Chromium";
 }
 
-std::wstring BrowserDistribution::GetEnvVersionKey() {
-  return L"CHROMIUM_VERSION";
-}
-
 bool BrowserDistribution::CanSetAsDefault() {
   return true;
 }
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index d60b675..53aa540 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -81,8 +81,6 @@ class BrowserDistribution {
 
   virtual std::wstring GetVersionKey();
 
-  virtual std::wstring GetEnvVersionKey();
-
   virtual bool CanSetAsDefault();
 
   virtual int GetIconIndex();
diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc
index 623715d..896cd87 100644
--- a/chrome/installer/util/chrome_frame_distribution.cc
+++ b/chrome/installer/util/chrome_frame_distribution.cc
@@ -95,10 +95,6 @@ std::wstring ChromeFrameDistribution::GetVersionKey() {
   return key;
 }
 
-std::wstring ChromeFrameDistribution::GetEnvVersionKey() {
-  return L"CHROME_FRAME_VERSION";
-}
-
 bool ChromeFrameDistribution::CanSetAsDefault() {
   return false;
 }
diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h
index 40ccf49..7c368119 100644
--- a/chrome/installer/util/chrome_frame_distribution.h
+++ b/chrome/installer/util/chrome_frame_distribution.h
@@ -44,8 +44,6 @@ class ChromeFrameDistribution : public BrowserDistribution {
 
   virtual std::wstring GetVersionKey();
 
-  virtual std::wstring GetEnvVersionKey();
-
   virtual bool CanSetAsDefault();
 
   // This is the point at which the Google Chrome installer removes the Google
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 375a4e1..f60fb96 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -492,10 +492,6 @@ std::wstring GoogleChromeDistribution::GetVersionKey() {
   return key;
 }
 
-std::wstring GoogleChromeDistribution::GetEnvVersionKey() {
-  return L"CHROME_VERSION";
-}
-
 // This method checks if we need to change "ap" key in Google Update to try
 // full installer as fall back method in case incremental installer fails.
 // - If incremental installer fails we append a magic string ("-full"), if
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index d6fa281..221f6b4 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -63,8 +63,6 @@ class GoogleChromeDistribution : public BrowserDistribution {
 
   virtual std::wstring GetVersionKey();
 
-  virtual std::wstring GetEnvVersionKey();
-
   virtual void UpdateDiffInstallStatus(bool system_install,
       bool incremental_install, installer_util::InstallStatus install_status);
 
diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc
index 0cb540c..94b2ddd 100644
--- a/chrome/installer/util/google_chrome_distribution_dummy.cc
+++ b/chrome/installer/util/google_chrome_distribution_dummy.cc
@@ -98,11 +98,6 @@ std::wstring GoogleChromeDistribution::GetVersionKey() {
   return std::wstring();
 }
 
-std::wstring GoogleChromeDistribution::GetEnvVersionKey() {
-  NOTREACHED();
-  return std::wstring();
-}
-
 void GoogleChromeDistribution::UpdateDiffInstallStatus(bool system_install,
       bool incremental_install, installer_util::InstallStatus install_status) {
   NOTREACHED();
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc
index be61503..b24c9c3 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.cc
+++ b/chrome/installer/util/google_chrome_sxs_distribution.cc
@@ -41,10 +41,6 @@ std::wstring GoogleChromeSxSDistribution::GetUninstallRegPath() {
       installer_util::kSxSSuffix);
 }
 
-std::wstring GoogleChromeSxSDistribution::GetEnvVersionKey() {
-  return L"CHROME_SXS_VERSION";
-}
-
 bool GoogleChromeSxSDistribution::CanSetAsDefault() {
   return false;
 }
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.h b/chrome/installer/util/google_chrome_sxs_distribution.h
index 8a53d34..5981d46 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.h
+++ b/chrome/installer/util/google_chrome_sxs_distribution.h
@@ -24,7 +24,6 @@ class GoogleChromeSxSDistribution : public GoogleChromeDistribution {
   virtual std::wstring GetBrowserAppId();
   virtual std::wstring GetInstallSubDir();
   virtual std::wstring GetUninstallRegPath();
-  virtual std::wstring GetEnvVersionKey();
   virtual bool CanSetAsDefault();
   virtual int GetIconIndex();
   virtual bool GetChromeChannel(std::wstring* channel);