Move xdg_util into base/nix. I originally wanted to use base/linux, but you

can't have a namespace called "linux" because it's ifdefed by GCC to be a
number. Same for "unix". "x11" was discarded because some future stuff in
here will not be related to x11.

This also renames base_paths_posix to base_paths_linux since this does not
apply to mac, and normally posix applies to mac (this confused me when I had to
edit it for the XDG stuff).

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3778007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62848 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/chrome/common/chrome_paths_linux.cc b/chrome/common/chrome_paths_linux.cc
index f0ff3fb..42c6ae7 100644
--- a/chrome/common/chrome_paths_linux.cc
+++ b/chrome/common/chrome_paths_linux.cc
@@ -7,7 +7,7 @@
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
-#include "base/xdg_util.h"
+#include "base/nix/xdg_util.h"
 
 namespace chrome {
 
@@ -19,7 +19,7 @@ namespace chrome {
 bool GetDefaultUserDataDirectory(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   FilePath config_dir(
-      base::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
+      base::nix::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
 #if defined(GOOGLE_CHROME_BUILD)
   *result = config_dir.Append("google-chrome");
 #else
@@ -31,7 +31,7 @@ bool GetDefaultUserDataDirectory(FilePath* result) {
 bool GetChromeFrameUserDataDirectory(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   FilePath config_dir(
-      base::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
+      base::nix::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
 #if defined(GOOGLE_CHROME_BUILD)
   *result = config_dir.Append("google-chrome-frame");
 #else
@@ -42,7 +42,7 @@ bool GetChromeFrameUserDataDirectory(FilePath* result) {
 
 bool GetUserDocumentsDirectory(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  *result = base::GetXDGUserDirectory(env.get(), "DOCUMENTS", "Documents");
+  *result = base::nix::GetXDGUserDirectory(env.get(), "DOCUMENTS", "Documents");
   return true;
 }
 
@@ -50,7 +50,7 @@ bool GetUserDocumentsDirectory(FilePath* result) {
 // ~ or their desktop directory, in which case we default to ~/Downloads.
 bool GetUserDownloadsDirectory(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  *result = base::GetXDGUserDirectory(env.get(), "DOWNLOAD", "Downloads");
+  *result = base::nix::GetXDGUserDirectory(env.get(), "DOWNLOAD", "Downloads");
 
   FilePath home = file_util::GetHomeDir();
   if (*result == home) {
@@ -69,7 +69,7 @@ bool GetUserDownloadsDirectory(FilePath* result) {
 
 bool GetUserDesktop(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  *result = base::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
+  *result = base::nix::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
   return true;
 }