OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 | 125 |
126 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, NoGalleries) { | 126 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, NoGalleries) { |
127 EnsureMediaDirectoriesExists media_directories; | 127 EnsureMediaDirectoriesExists media_directories; |
128 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_galleries")) | 128 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_galleries")) |
129 << message_; | 129 << message_; |
130 } | 130 } |
131 | 131 |
132 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, | 132 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, |
133 MediaGalleriesRead) { | 133 MediaGalleriesRead) { |
134 EnsureMediaDirectoriesExists media_directories; | 134 EnsureMediaDirectoriesExists media_directories; |
135 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/read_access")) | 135 ASSERT_TRUE(RunPlatformAppTestReturnImmediately( |
136 << message_; | 136 "api_test/media_galleries/read_access")) << message_; |
137 RunSecondTestPhase(media_directories.num_galleries()); | 137 RunSecondTestPhase(media_directories.num_galleries()); |
| 138 CloseShellWindowsAndWaitForAppToExit(); |
138 } | 139 } |
139 | 140 |
140 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, | 141 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, |
141 MediaGalleriesNoAccess) { | 142 MediaGalleriesNoAccess) { |
142 EnsureMediaDirectoriesExists media_directories; | 143 EnsureMediaDirectoriesExists media_directories; |
143 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_access")) | 144 ASSERT_TRUE(RunPlatformAppTestReturnImmediately( |
144 << message_; | 145 "api_test/media_galleries/no_access")) << message_; |
145 RunSecondTestPhase(media_directories.num_galleries()); | 146 RunSecondTestPhase(media_directories.num_galleries()); |
| 147 CloseShellWindowsAndWaitForAppToExit(); |
146 } | 148 } |
147 | 149 |
148 IN_PROC_BROWSER_TEST_F(ExperimentalMediaGalleriesApiTest, | 150 IN_PROC_BROWSER_TEST_F(ExperimentalMediaGalleriesApiTest, |
149 ExperimentalMediaGalleries) { | 151 ExperimentalMediaGalleries) { |
150 ASSERT_TRUE(RunExtensionTest("media_galleries/experimental")) << message_; | 152 ASSERT_TRUE(RunExtensionTest("media_galleries/experimental")) << message_; |
151 } | 153 } |
OLD | NEW |