base: Get rid of the deprecated SysInfo::GetEnvVar.

courgette/encoded_program.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "courgette/encoded_program.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
+#include "base/env_var.h"
 #include "base/logging.h"
-#include "base/sys_info.h"
+#include "base/scoped_ptr.h"
+#include "base/string_util.h"
 
 #include "courgette/courgette.h"
 #include "courgette/streams.h"
 
 namespace courgette {
 
 // Stream indexes.
 const int kStreamMisc    = 0;
 const int kStreamOps     = 1;
 const int kStreamBytes   = 2;
@@ skipping 233 matching lines @@
   INCLUDE_REL32_INDEXES   = 0x0020,
   INCLUDE_OPS             = 0x0100,
   INCLUDE_BYTES           = 0x0200,
   INCLUDE_COPY_COUNTS     = 0x0400,
   INCLUDE_MISC            = 0x1000
 };
 
 static FieldSelect GetFieldSelect() {
 #if 1
   // TODO(sra): Use better configuration.
-  std::wstring s = base::SysInfo::GetEnvVar(L"A_FIELDS");
+  scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
+  std::string s;
+  env->GetEnv("A_FIELDS", &s);
   if (!s.empty()) {
-    return static_cast<FieldSelect>(wcstoul(s.c_str(), 0, 0));
+    return static_cast<FieldSelect>(wcstoul(ASCIIToWide(s).c_str(), 0, 0));
   }
 #endif
   return  static_cast<FieldSelect>(~0);
 }
 
 void EncodedProgram::WriteTo(SinkStreamSet* streams) {
   FieldSelect select = GetFieldSelect();
 
   // The order of fields must be consistent in WriteTo and ReadFrom, regardless
   // of the streams used.  The code can be configured with all kStreamXXX
@@ skipping 276 matching lines @@
   if (assembled)
     return C_OK;
   return C_ASSEMBLY_FAILED;
 }
 
 void DeleteEncodedProgram(EncodedProgram* encoded) {
   delete encoded;
 }
 
 }  // end namespace