Use Environment::SetVar in more places.

chrome/browser/first_run/first_run_win.cc

 // Copyright (c) 2010 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/first_run/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <set>
 #include <sstream>
 
 // TODO(port): trim this include list once first run has been refactored fully.
 #include "app/app_switches.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
+#include "base/environment.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/object_watcher.h"
 #include "base/path_service.h"
 #include "base/process.h"
 #include "base/process_util.h"
 #include "base/registry.h"
 #include "base/scoped_comptr_win.h"
+#include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
@@ skipping 379 matching lines @@
   std::transform(exe.begin(), exe.end(), exe.begin(), tolower);
   exe = L"Global\\" + exe;
   if (handle != NULL)
     CloseHandle(handle);
   handle = CreateEvent(NULL, TRUE, TRUE, exe.c_str());
   int error = GetLastError();
   return (error == ERROR_ALREADY_EXISTS || error == ERROR_ACCESS_DENIED);
 }
 
 bool Upgrade::RelaunchChromeBrowser(const CommandLine& command_line) {
-  ::SetEnvironmentVariable(
-    BrowserDistribution::GetDistribution()->GetEnvVersionKey().c_str(),
-    NULL);
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  env->UnSetVar(WideToUTF8(
+      BrowserDistribution::GetDistribution()->GetEnvVersionKey()).c_str());
   return base::LaunchApp(command_line.command_line_string(),
                          false, false, NULL);
 }
 
 bool Upgrade::SwapNewChromeExeIfPresent() {
   FilePath new_chrome_exe;
   if (!GetNewerChromeFile(&new_chrome_exe))
     return false;
   if (!file_util::PathExists(new_chrome_exe))
     return false;
@@ skipping 625 matching lines @@
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   if (version > 10000) {
     // This is a test value. We want to make sure we exercise
     // returning this early. See EarlyReturnTest test harness.
     return Upgrade::TD_NOT_NOW;
   }
   TryChromeDialog td;
   return td.ShowModal();
 }