Cleanup: Consolidate declarations of XDG variables.

chrome/common/auto_start_linux.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "chrome/common/auto_start_linux.h"
 
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/string_tokenizer.h"
 
 namespace {
 
 const FilePath::CharType kAutostart[] = "autostart";
-const FilePath::CharType kConfig[] = ".config";
-const char kXdgConfigHome[] = "XDG_CONFIG_HOME";
 
 FilePath GetAutostartDirectory(base::Environment* environment) {
-  FilePath result =
-      base::nix::GetXDGDirectory(environment, kXdgConfigHome, kConfig);
+  FilePath result = base::nix::GetXDGDirectory(environment,
+                                               base::nix::kXdgConfigHomeEnvVar,
+                                               base::nix::kDotConfigDir);
   result = result.Append(kAutostart);
   return result;
 }
 
 }  // namespace
 
 bool AutoStart::AddApplication(const std::string& autostart_filename,
                                const std::string& application_name,
                                const std::string& command_line,
                                bool is_terminal_app) {
@@ skipping 46 matching lines @@
   StringTokenizer tokenizer(contents, "\n");
   std::string token = value_name + "=";
   while (tokenizer.GetNext()) {
     if (tokenizer.token().substr(0, token.length()) == token) {
       *value = tokenizer.token().substr(token.length());
       return true;
     }
   }
   return false;
 }