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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 | 126 |
127 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, | 127 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, |
128 MediaGalleriesRead) { | 128 MediaGalleriesRead) { |
129 chrome::EnsureMediaDirectoriesExists media_directories; | 129 chrome::EnsureMediaDirectoriesExists media_directories; |
130 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/read_access")) | 130 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/read_access")) |
131 << message_; | 131 << message_; |
132 RunSecondTestPhase(base::UTF8ToUTF16(base::StringPrintf( | 132 RunSecondTestPhase(base::UTF8ToUTF16(base::StringPrintf( |
133 kTestGalleries, media_directories.num_galleries()))); | 133 kTestGalleries, media_directories.num_galleries()))); |
134 } | 134 } |
135 | 135 |
136 // Flakily times out: http://crbug.com/268481 | |
137 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, | 136 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, |
138 DISABLED_MediaGalleriesCopyTo) { | 137 MediaGalleriesCopyTo) { |
139 chrome::EnsureMediaDirectoriesExists media_directories; | 138 chrome::EnsureMediaDirectoriesExists media_directories; |
140 base::ScopedTempDir temp_dir; | 139 base::ScopedTempDir temp_dir; |
141 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); | 140 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); |
142 MakeFakeMediaGalleryForTest(browser()->profile(), temp_dir.path()); | 141 MakeFakeMediaGalleryForTest(browser()->profile(), temp_dir.path()); |
143 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/copy_to_access")) | 142 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/copy_to_access")) |
144 << message_; | 143 << message_; |
145 } | 144 } |
146 | 145 |
147 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, | 146 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, |
148 MediaGalleriesCopyToNoAccess) { | 147 MediaGalleriesCopyToNoAccess) { |
(...skipping 21 matching lines...) Expand all Loading... |
170 | 169 |
171 DetachFakeDevice(); | 170 DetachFakeDevice(); |
172 } | 171 } |
173 | 172 |
174 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, | 173 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, |
175 GetFilesystemMetadata) { | 174 GetFilesystemMetadata) { |
176 chrome::EnsureMediaDirectoriesExists media_directories; | 175 chrome::EnsureMediaDirectoriesExists media_directories; |
177 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/metadata")) | 176 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/metadata")) |
178 << message_; | 177 << message_; |
179 } | 178 } |
OLD | NEW |