Move EnvironmentVariableGetter from base/linux_util.h to base/env_var.h. Labe...

chrome/browser/web_applications/web_app.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 "chrome/browser/web_applications/web_app.h"
 
 #if defined(OS_WIN)
 #include <ShellAPI.h>
 #endif  // defined(OS_WIN)
 
 #include <algorithm>
@@ skipping 14 matching lines @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "webkit/glue/dom_operations.h"
 
 #if defined(OS_LINUX)
-#include "base/linux_util.h"
+#include "base/env_var.h"
 #endif  // defined(OS_LINUX)
 
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #include "gfx/icon_util.h"
 #endif  // defined(OS_WIN)
 
 namespace {
 
 const FilePath::CharType kIconChecksumFileExt[] = FILE_PATH_LITERAL(".ico.md5");
@@ skipping 207 matching lines @@
 
   if (callback_ != NULL)
     message_loop_->PostTask(FROM_HERE,
       new CreateShortcutCallbackTask(callback_, success));
 }
 
 bool CreateShortcutTask::CreateShortcut() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
 
 #if defined(OS_LINUX)
-  scoped_ptr<base::EnvironmentVariableGetter> env_getter(
-      base::EnvironmentVariableGetter::Create());
+  scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());
 
   std::string shortcut_template;
   if (!ShellIntegration::GetDesktopShortcutTemplate(env_getter.get(),
                                                     &shortcut_template)) {
     return false;
   }
   ShellIntegration::CreateDesktopShortcut(shortcut_info_, shortcut_template);
   return true;  // assuming always success.
 #elif defined(OS_WIN)
   // Shortcut paths under which to create shortcuts.
@@ skipping 482 matching lines @@
 
 void UpdateShortcutForTabContents(TabContents* tab_contents) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(tab_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 };  // namespace web_app