Revert 67191 - chrome_paths: refactor and sanitize cache directory handling...

base/path_service_unittest.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 "base/path_service.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/file_path.h"
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest/include/gtest/gtest-spi.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 // Returns true if PathService::Get returns true and sets the path parameter
 // to non-empty for the given PathService::DirType enumeration value.
 bool ReturnsValidPath(int dir_type) {
   FilePath path;
   bool result = PathService::Get(dir_type, &path);
 #if defined(OS_POSIX)
-  // If chromium has never been started on this account, the cache path may not
+  // If chromium has never been started on this account, the cache path will not
   // exist.
-  if (dir_type == base::DIR_CACHE)
+  if (dir_type == base::DIR_USER_CACHE)
     return result && !path.value().empty();
 #endif
   return result && !path.value().empty() && file_util::PathExists(path);
 }
 
 #if defined(OS_WIN)
 // Function to test DIR_LOCAL_APP_DATA_LOW on Windows XP. Make sure it fails.
 bool ReturnsInvalidPath(int dir_type) {
   FilePath path;
   bool result = PathService::Get(base::DIR_LOCAL_APP_DATA_LOW, &path);
@@ skipping 25 matching lines @@
     } else {
       EXPECT_TRUE(ReturnsValidPath(key)) << key;
     }
   }
 #elif defined(OS_MACOSX)
   for (int key = base::PATH_MAC_START + 1; key < base::PATH_MAC_END; ++key) {
       EXPECT_PRED1(ReturnsValidPath, key);
   }
 #endif
 }