Fixing issue with early unset of version variable.

chrome/browser/lifetime/application_lifetime_win.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/browser/lifetime/application_lifetime.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/win/metro.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 53 matching lines @@
 #if defined(USE_AURA)
 void ActivateDesktopHelperReply() {
   AttemptRestart();
 }
 
 void ActivateDesktopHelper() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   std::string version_str;
 
   // Get the version variable and remove it from the environment.
-  if (env->GetVar(chrome::kChromeVersionEnvVar, &version_str))
-    env->UnSetVar(chrome::kChromeVersionEnvVar);
-  else
+  if (!env->GetVar(chrome::kChromeVersionEnvVar, &version_str))
     version_str.clear();
 
   base::FilePath exe_path;
   if (!PathService::Get(base::FILE_EXE, &exe_path))
     return;
 
   base::FilePath path(exe_path.DirName());
 
   // The relauncher is ordinarily in the version directory.  When running in a
   // build tree however (where CHROME_VERSION is not set in the environment)
@@ skipping 29 matching lines @@
 }
 
 void AttemptRestartToMetroMode() {
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetString(prefs::kRelaunchMode,
                    upgrade_util::kRelaunchModeMetro);
   AttemptRestart();
 }
 
 }  // namespace chrome