Skip to content

Commit

Permalink
Pepper: Enable some FileRef in-process tests.
Browse files Browse the repository at this point in the history
At some point, some FileRef tests were disabled for in-process plugins.
Refactoring FileRef to the browser fixes this problem, so we can enable these
tests again.

BUG=

Review URL: https://codereview.chromium.org/23513084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226321 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
teravest@chromium.org committed Oct 1, 2013
1 parent 66ec11d commit 0a612e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
6 changes: 2 additions & 4 deletions chrome/test/ppapi/ppapi_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -858,11 +858,9 @@ IN_PROC_BROWSER_TEST_F(PPAPITest, FileRef) {
LIST_TEST(FileRef_QueryAndTouchFile)
LIST_TEST(FileRef_DeleteFileAndDirectory)
LIST_TEST(FileRef_RenameFileAndDirectory)
// TODO(teravest): Add in-process support.
// LIST_TEST(FileRef_Query)
LIST_TEST(FileRef_Query)
LIST_TEST(FileRef_FileNameEscaping)
// TODO(teravest): Add in-process support.
// LIST_TEST(FileRef_ReadDirectoryEntries)
LIST_TEST(FileRef_ReadDirectoryEntries)
);
}
// OutOfProcessPPAPITest.FileRef times out fairly often.
Expand Down
8 changes: 2 additions & 6 deletions ppapi/tests/test_file_ref.cc
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,9 @@ void TestFileRef::RunTests(const std::string& filter) {
RUN_CALLBACK_TEST(TestFileRef, QueryAndTouchFile, filter);
RUN_CALLBACK_TEST(TestFileRef, DeleteFileAndDirectory, filter);
RUN_CALLBACK_TEST(TestFileRef, RenameFileAndDirectory, filter);
// FileRef::Query is out-of-process only.
if (testing_interface_->IsOutOfProcess())
RUN_CALLBACK_TEST(TestFileRef, Query, filter);
RUN_CALLBACK_TEST(TestFileRef, Query, filter);
RUN_CALLBACK_TEST(TestFileRef, FileNameEscaping, filter);
// FileRef::ReadDirectoryEntries is out-of-process only.
if (testing_interface_->IsOutOfProcess())
RUN_CALLBACK_TEST(TestFileRef, ReadDirectoryEntries, filter);
RUN_CALLBACK_TEST(TestFileRef, ReadDirectoryEntries, filter);
}

std::string TestFileRef::TestCreate() {
Expand Down

0 comments on commit 0a612e0

Please sign in to comment.