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

chrome/browser/browser_init.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_init.h"
 
 #include <algorithm>   // For max().
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/env_var.h"
 #include "base/event_recorder.h"
 #include "base/path_service.h"
-#include "base/sys_info.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/chrome_frame_automation_provider.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/browser/extensions/extensions_service.h"
@@ skipping 276 matching lines @@
 LaunchMode GetLaunchShortcutKind() {
   STARTUPINFOW si = { sizeof(si) };
   GetStartupInfoW(&si);
   if (si.dwFlags & 0x800) {
     if (!si.lpTitle)
       return LM_SHORTCUT_NONAME;
     std::wstring shortcut(si.lpTitle);
     // The windows quick launch path is not localized.
     if (shortcut.find(L"\\Quick Launch\\") != std::wstring::npos)
       return LM_SHORTCUT_QUICKLAUNCH;
-    std::wstring appdata_path = base::SysInfo::GetEnvVar(L"USERPROFILE");
+    scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
+    std::string appdata_path;
+    env->GetEnv("USERPROFILE", &appdata_path);
     if (!appdata_path.empty() &&
-        shortcut.find(appdata_path) != std::wstring::npos)
+        shortcut.find(ASCIIToWide(appdata_path)) != std::wstring::npos)
       return LM_SHORTCUT_DESKTOP;
     return LM_SHORTCUT_UNKNOWN;
   }
   return LM_SHORTCUT_NONE;
 }
 #else
 // TODO(cpu): Port to other platforms.
 LaunchMode GetLaunchShortcutKind() {
   return LM_LINUX_MAC_BEOS;
 }
@@ skipping 722 matching lines @@
   scoped_refptr<AutomationProviderClass> automation =
       new AutomationProviderClass(profile);
   automation->ConnectToChannel(channel_id);
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 }