Use Environment::SetVar in more places.

chrome/browser/browser_main_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/browser_main.h"
 #include "chrome/browser/browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/win_util.h"
 #include "base/command_line.h"
+#include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/nss_util.h"
 #include "base/path_service.h"
+#include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/views/uninstall_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/helper.h"
@@ skipping 73 matching lines @@
   }
   return ret;
 }
 
 // Prepares the localized strings that are going to be displayed to
 // the user if the browser process dies. These strings are stored in the
 // environment block so they are accessible in the early stages of the
 // chrome executable's lifetime.
 void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) {
   // Clear this var so child processes don't show the dialog by default.
-  ::SetEnvironmentVariableW(ASCIIToWide(env_vars::kShowRestart).c_str(), NULL);
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  env->UnSetVar(env_vars::kShowRestart);
 
   // For non-interactive tests we don't restart on crash.
-  if (::GetEnvironmentVariableW(ASCIIToWide(env_vars::kHeadless).c_str(),
-                                NULL, 0)) {
+  if (env->HasVar(env_vars::kHeadless))
     return;
-  }
 
   // If the known command-line test options are used we don't create the
   // environment block which means we don't get the restart dialog.
   if (parsed_command_line.HasSwitch(switches::kBrowserCrashTest) ||
       parsed_command_line.HasSwitch(switches::kBrowserAssertTest) ||
       parsed_command_line.HasSwitch(switches::kNoErrorDialogs))
     return;
 
   // The encoding we use for the info is "title|context|direction" where
   // direction is either env_vars::kRtlLocale or env_vars::kLtrLocale depending
   // on the current locale.
   std::wstring dlg_strings;
   dlg_strings.append(l10n_util::GetString(IDS_CRASH_RECOVERY_TITLE));
   dlg_strings.append(L"|");
   dlg_strings.append(l10n_util::GetString(IDS_CRASH_RECOVERY_CONTENT));
   dlg_strings.append(L"|");
   if (base::i18n::IsRTL())
     dlg_strings.append(ASCIIToWide(env_vars::kRtlLocale));
   else
     dlg_strings.append(ASCIIToWide(env_vars::kLtrLocale));
 
-  ::SetEnvironmentVariableW(ASCIIToWide(env_vars::kRestartInfo).c_str(),
-                            dlg_strings.c_str());
+  env->SetVar(env_vars::kRestartInfo, WideToUTF8(dlg_strings));
 }
 
 // This method handles the --hide-icons and --show-icons command line options
 // for chrome that get triggered by Windows from registry entries
 // HideIconsCommand & ShowIconsCommand. Chrome doesn't support hide icons
 // functionality so we just ask the users if they want to uninstall Chrome.
 int HandleIconsCommands(const CommandLine &parsed_command_line) {
   if (parsed_command_line.HasSwitch(switches::kHideIcons)) {
     std::wstring cp_applet;
     win_util::WinVersion version = win_util::GetWinVersion();
@@ skipping 80 matching lines @@
       base::EnsureNSPRInit();
     }
   }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsWin(parameters);
 }