Make base::Environment::Create() return unique_ptrs.

ui/base/l10n/l10n_util_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
@@ skipping 118 matching lines @@
   for (size_t i = 0; i < arraysize(filenames); ++i) {
     base::FilePath filename = new_locale_dir.AppendASCII(
         filenames[i] + ".pak");
     base::WriteFile(filename, "", 0);
   }
 
   // Keep a copy of ICU's default locale before we overwrite it.
   const std::string original_locale = base::i18n::GetConfiguredLocale();
 
   if (kPlatformHasDefaultLocale && kUseLocaleFromEnvironment) {
-    env.reset(base::Environment::Create());
+    env = base::Environment::Create();
 
     // Test the support of LANGUAGE environment variable.
     base::i18n::SetICUDefaultLocale("en-US");
     env->SetVar("LANGUAGE", "xx:fr_CA");
     EXPECT_EQ("fr", l10n_util::GetApplicationLocale(std::string()));
     EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage());
 
     env->SetVar("LANGUAGE", "xx:yy:en_gb.utf-8@quot");
     EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(std::string()));
     EXPECT_STREQ("en", icu::Locale::getDefault().getLanguage());
@@ skipping 417 matching lines @@
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("Latin"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("German"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("pt--BR"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("sl-macedonia"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x="));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@=y"));
 }