diff options
| author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 18:16:25 +0000 |
|---|---|---|
| committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 18:16:25 +0000 |
| commit | ce576fe29effdf478823cfca4856b4b6e6fcf784 (patch) | |
| tree | c3111fe05eae0272b981f4ce1caac8e0561992e6 /base | |
| parent | fd42270f7d1c9b6c560e69592075fe1fc880325c (diff) | |
| download | chromium_src-ce576fe29effdf478823cfca4856b4b6e6fcf784.zip chromium_src-ce576fe29effdf478823cfca4856b4b6e6fcf784.tar.gz chromium_src-ce576fe29effdf478823cfca4856b4b6e6fcf784.tar.bz2 | |
Fix PathServiceTest.Get on iOS.
DIR_USER_DESKTOP does not apply on iOS, so exclude it from the set of paths that
are tested.
BUG=b/151050
Review URL: https://chromiumcodereview.appspot.com/10970019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base_paths_mac.mm | 6 | ||||
| -rw-r--r-- | base/path_service_unittest.cc | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/base/base_paths_mac.mm b/base/base_paths_mac.mm index 2227d7d..630f742 100644 --- a/base/base_paths_mac.mm +++ b/base/base_paths_mac.mm @@ -92,7 +92,13 @@ bool PathProviderMac(int key, FilePath* result) { #endif return true; case base::DIR_USER_DESKTOP: +#if defined(OS_IOS) + // iOS does not have desktop directories. + NOTIMPLEMENTED(); + return false; +#else return base::mac::GetUserDirectory(NSDesktopDirectory, result); +#endif case base::DIR_CACHE: return base::mac::GetUserDirectory(NSCachesDirectory, result); case base::DIR_HOME: diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc index 158b745..e4bda0c 100644 --- a/base/path_service_unittest.cc +++ b/base/path_service_unittest.cc @@ -82,6 +82,9 @@ TEST_F(PathServiceTest, Get) { #if defined(OS_ANDROID) if (key == base::FILE_MODULE || key == base::DIR_USER_DESKTOP) continue; // Android doesn't implement FILE_MODULE and DIR_USER_DESKTOP; +#elif defined(OS_IOS) + if (key == base::DIR_USER_DESKTOP) + continue; // iOS doesn't implement DIR_USER_DESKTOP; #endif EXPECT_PRED1(ReturnsValidPath, key); } |