Simplify get_photo_types_by_extension_test and get_movie_types_by_extension_test.
Merge branch 'master' of github.com:gallery/gallery3