diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 21:15:18 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 21:15:18 +0000 |
| commit | 1bbe43b899a2274befb535c1854acd0bc59541c5 (patch) | |
| tree | 07e47088c3aafde696a442752a2e93ffc916b242 /webkit | |
| parent | 5ccc1b7e59902c9263c9fc1dc72b3b15a92b9092 (diff) | |
| download | chromium_src-1bbe43b899a2274befb535c1854acd0bc59541c5.zip chromium_src-1bbe43b899a2274befb535c1854acd0bc59541c5.tar.gz chromium_src-1bbe43b899a2274befb535c1854acd0bc59541c5.tar.bz2 | |
Fix PPAPITest.DirectoryReader:
- make sure the result won't be affected by other tests or previous runs of the same test;
- don't assert if the directory to read is empty.
TEST=The test itself.
BUG=63239
Review URL: http://codereview.chromium.org/7094008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_directory_reader_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/plugins/ppapi/ppb_directory_reader_impl.cc b/webkit/plugins/ppapi/ppb_directory_reader_impl.cc index 77935cf..33ca825 100644 --- a/webkit/plugins/ppapi/ppb_directory_reader_impl.cc +++ b/webkit/plugins/ppapi/ppb_directory_reader_impl.cc @@ -124,7 +124,7 @@ int32_t PPB_DirectoryReader_Impl::GetNextEntry( void PPB_DirectoryReader_Impl::AddNewEntries( const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more) { - DCHECK(!entries.empty()); + DCHECK(!entries.empty() || !has_more); has_more_ = has_more; std::string dir_path = directory_ref_->GetPath(); if (dir_path[dir_path.size() - 1] != '/') |