base: Rename EnvVarGetter to Environment.

app/l10n_util_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 "build/build_config.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <cstdlib>
 #endif
 
 #include "app/app_paths.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #if !defined(OS_MACOSX)
 #include "app/test/data/resource.h"
 #endif
 #include "base/basictypes.h"
-#include "base/env_var.h"
+#include "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #endif
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "unicode/locid.h"
@@ skipping 103 matching lines @@
   for (size_t i = 0; i < arraysize(filenames); ++i) {
     FilePath filename = new_locale_dir.AppendASCII(
         filenames[i] + kLocaleFileExtension);
     file_util::WriteFile(filename, "", 0);
   }
 
   // Keep a copy of ICU's default locale before we overwrite it.
   icu::Locale locale = icu::Locale::getDefault();
 
 #if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-  scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
+  scoped_ptr<base::Environment> env(base::Environment::Create());
 
   // Test the support of LANGUAGE environment variable.
   SetICUDefaultLocale("en-US");
   env->SetEnv("LANGUAGE", "xx:fr_CA");
   EXPECT_EQ("fr", l10n_util::GetApplicationLocale(L""));
 
   env->SetEnv("LANGUAGE", "xx:yy:en_gb.utf-8@quot");
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(L""));
 
   env->SetEnv("LANGUAGE", "xx:zh-hk");
@@ skipping 141 matching lines @@
 
   result = l10n_util::GetDisplayNameForLocale("zh-TW", "en", false);
   EXPECT_EQ(result, ASCIIToUTF16("Chinese (Traditional Han)"));
 
   result = l10n_util::GetDisplayNameForLocale("pt-BR", "en", false);
   EXPECT_EQ(result, ASCIIToUTF16("Portuguese (Brazil)"));
 
   result = l10n_util::GetDisplayNameForLocale("es-419", "en", false);
   EXPECT_EQ(result, ASCIIToUTF16("Spanish (Latin America and the Caribbean)"));
 }