base: Rename EnvVarGetter to Environment.

chrome/browser/profile_impl.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/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
-#include "base/env_var.h"
+#include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/background_contents_service.h"
@@ skipping 836 matching lines @@
   // the desktop environment currently running, allowing GNOME Keyring in XFCE.
   // (In all cases we fall back on the default store in case of failure.)
   base::DesktopEnvironment desktop_env;
   std::wstring store_type = CommandLine::ForCurrentProcess()->GetSwitchValue(
       switches::kPasswordStore);
   if (store_type == L"kwallet") {
     desktop_env = base::DESKTOP_ENVIRONMENT_KDE4;
   } else if (store_type == L"gnome") {
     desktop_env = base::DESKTOP_ENVIRONMENT_GNOME;
   } else if (store_type == L"detect") {
-    scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());
-    desktop_env = base::GetDesktopEnvironment(env_getter.get());
+    scoped_ptr<base::Environment> env(base::Environment::Create());
+    desktop_env = base::GetDesktopEnvironment(env.get());
     LOG(INFO) << "Password storage detected desktop environment: " <<
               base::GetDesktopEnvironmentName(desktop_env);
   } else {
     // TODO(mdm): If the flag is not given, or has an unknown value, use the
     // default store for now. Once we're confident in the other stores, we can
     // default to detecting the desktop environment instead.
     desktop_env = base::DESKTOP_ENVIRONMENT_OTHER;
   }
 
   scoped_ptr<PasswordStoreX::NativeBackend> backend;
@@ skipping 290 matching lines @@
       new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess()));
   sync_service_.reset(
       profile_sync_factory_->CreateProfileSyncService());
   sync_service_->Initialize();
 }
 
 void ProfileImpl::InitCloudPrintProxyService() {
   cloud_print_proxy_service_.reset(new CloudPrintProxyService(this));
   cloud_print_proxy_service_->Initialize();
 }