Revert 157667 - Add new PathService paths for Windows' All Users Desktop and Quick Launch folders.

base/base_paths_mac.mm

 // 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.
 
-// Defines base::PathProviderMac which replaces base::PathProviderPosix for Mac
-// in base/path_service.cc.
+#include "base/base_paths_mac.h"
 
 #include <dlfcn.h>
 #import <Foundation/Foundation.h>
 #include <mach-o/dyld.h>
 
-#include "base/base_paths.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
-#include "build/build_config.h"
 
 namespace {
 
 void GetNSExecutablePath(FilePath* path) {
   DCHECK(path);
   // Executable path can have relative references ("..") depending on
   // how the app was launched.
   uint32_t executable_length = 0;
   _NSGetExecutablePath(NULL, &executable_length);
   DCHECK_GT(executable_length, 1u);
@@ skipping 22 matching lines @@
 namespace base {
 
 bool PathProviderMac(int key, FilePath* result) {
   switch (key) {
     case base::FILE_EXE:
       GetNSExecutablePath(result);
       return true;
     case base::FILE_MODULE:
       return GetModulePathForAddress(result,
           reinterpret_cast<const void*>(&base::PathProviderMac));
+    case base::DIR_CACHE:
+      return base::mac::GetUserDirectory(NSCachesDirectory, result);
     case base::DIR_APP_DATA: {
       bool success = base::mac::GetUserDirectory(NSApplicationSupportDirectory,
                                                  result);
 #if defined(OS_IOS)
       // On IOS, this directory does not exist unless it is created explicitly.
       if (success && !file_util::PathExists(*result))
         success = file_util::CreateDirectory(*result);
 #endif  // defined(OS_IOS)
       return success;
     }
-    case base::DIR_SOURCE_ROOT:
+    case base::DIR_SOURCE_ROOT: {
       // Go through PathService to catch overrides.
       if (!PathService::Get(base::FILE_EXE, result))
         return false;
 
       // Start with the executable's directory.
       *result = result->DirName();
 
 #if !defined(OS_IOS)
       if (base::mac::AmIBundled()) {
         // The bundled app executables (Chromium, TestShell, etc) live five
         // levels down, eg:
         // src/xcodebuild/{Debug|Release}/Chromium.app/Contents/MacOS/Chromium
         *result = result->DirName().DirName().DirName().DirName().DirName();
       } else {
         // Unit tests execute two levels deep from the source root, eg:
         // src/xcodebuild/{Debug|Release}/base_unittests
         *result = result->DirName().DirName();
       }
 #endif
       return true;
-    case base::DIR_USER_DESKTOP:
-      return base::mac::GetUserDirectory(NSDesktopDirectory, result);
-    case base::DIR_CACHE:
-      return base::mac::GetUserDirectory(NSCachesDirectory, result);
-    case base::DIR_HOME:
+    }
+    case base::DIR_HOME: {
       *result = base::mac::NSStringToFilePath(NSHomeDirectory());
       return true;
+    }
     default:
       return false;
   }
 }
 
 }  // namespace base