Use Environment::SetVar in more places.

chrome_frame/crash_reporting/nt_loader_unittest.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_frame/crash_reporting/nt_loader.h"
 
 #include <tlhelp32.h>
 #include <winnt.h>
 #include <base/at_exit.h>
+#include <base/environment.h>
 #include <base/message_loop.h>
 #include <base/scoped_handle.h>
+#include <base/scoped_ptr.h>
 #include <base/string_util.h>
 #include <base/sys_info.h>
 #include <base/thread.h>
+#include <base/utf_string_conversions.h>
 #include "chrome_frame/crash_reporting/crash_dll.h"
 #include "gtest/gtest.h"
 
 namespace {
 void AssertIsCriticalSection(CRITICAL_SECTION* critsec) {
   // Assert on some of the internals of the debug info if it has one.
   RTL_CRITICAL_SECTION_DEBUG* debug = critsec->DebugInfo;
   if (debug) {
     ASSERT_EQ(RTL_CRITSECT_TYPE, debug->Type);
     ASSERT_EQ(critsec, debug->CriticalSection);
@@ skipping 160 matching lines @@
   ~NtLoaderTest() {
     EXPECT_TRUE(this == current_);
     current_ = NULL;
   }
 
   void SetUp() {
     veh_id_ = ::AddVectoredExceptionHandler(FALSE, &ExceptionHandler);
     EXPECT_TRUE(veh_id_ != NULL);
 
     // Clear the crash DLL environment.
-    ::SetEnvironmentVariable(kCrashOnLoadMode, NULL);
-    ::SetEnvironmentVariable(kCrashOnUnloadMode, NULL);
+    scoped_ptr<base::Environment> env(base::Environment::Create());
+    env->UnSetVar(WideToASCII(kCrashOnLoadMode).c_str());
+    env->UnSetVar(WideToASCII(kCrashOnUnloadMode).c_str());
   }
 
   void TearDown() {
     if (veh_id_ != NULL)
       EXPECT_NE(0, ::RemoveVectoredExceptionHandler(veh_id_));
 
     // Clear the crash DLL environment.
-    ::SetEnvironmentVariable(kCrashOnLoadMode, NULL);
-    ::SetEnvironmentVariable(kCrashOnUnloadMode, NULL);
+    scoped_ptr<base::Environment> env(base::Environment::Create());
+    env->UnSetVar(WideToASCII(kCrashOnLoadMode).c_str());
+    env->UnSetVar(WideToASCII(kCrashOnUnloadMode).c_str());
   }
 
   void set_exception_function(ExceptionFunction func) {
     exception_function_ = func;
   }
 
  private:
   static LONG NTAPI ExceptionHandler(EXCEPTION_POINTERS* ex_ptrs){
     // Dispatch the exception to any exception function,
     // but only on the main thread.
@@ skipping 37 matching lines @@
   nt_loader::LDR_DATA_TABLE_ENTRY* entry = GetLoaderEntry(crash_dll);
   ASSERT_TRUE(entry != NULL);
   ASSERT_EQ(0, entry->Flags & LDRP_PROCESS_ATTACH_CALLED);
 }
 
 TEST_F(NtLoaderTest, CrashOnLoadLibrary) {
   exceptions_handled = 0;
   set_exception_function(OnCrashDuringLoadLibrary);
 
   // Setup to crash on load.
-  ::SetEnvironmentVariable(kCrashOnLoadMode, L"1");
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  env->SetVar(WideToASCII(kCrashOnLoadMode).c_str(), "1");
 
   // And load it.
   HMODULE module = ::LoadLibrary(kCrashDllName);
   DWORD err = ::GetLastError();
   EXPECT_EQ(NULL, module);
   EXPECT_EQ(ERROR_NOACCESS, err);
   EXPECT_EQ(1, exceptions_handled);
 
   if (module != NULL)
     ::FreeLibrary(module);
@@ skipping 14 matching lines @@
 
   HMODULE crash_dll = ::GetModuleHandle(kCrashDllName);
   ASSERT_TRUE(crash_dll == NULL);
 
   nt_loader::LDR_DATA_TABLE_ENTRY* entry = GetLoaderEntry(crash_dll);
   ASSERT_TRUE(entry == NULL);
 }
 
 TEST_F(NtLoaderTest, CrashOnUnloadLibrary) {
   // Setup to crash on unload.
-  ::SetEnvironmentVariable(kCrashOnUnloadMode, L"1");
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  env->SetVar(WideToASCII(kCrashOnUnloadMode).c_str(), "1");
 
   // And load it.
   HMODULE module = ::LoadLibrary(kCrashDllName);
   EXPECT_TRUE(module != NULL);
 
   exceptions_handled = 0;
   set_exception_function(OnCrashDuringUnloadLibrary);
 
   // We should crash during unload.
   if (module != NULL)
     ::FreeLibrary(module);
 
   EXPECT_EQ(1, exceptions_handled);
 }