Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc

Issue 2692003002: Fix disabling of FileSystemProviderApiTest.ReadFile (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/files/file.h" 8 #include "base/files/file.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 } 155 }
156 156
157 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, ReadDirectory) { 157 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, ReadDirectory) {
158 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/read_directory", 158 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/read_directory",
159 kFlagLoadAsComponent)) 159 kFlagLoadAsComponent))
160 << message_; 160 << message_;
161 } 161 }
162 162
163 // http://crbug.com/691449 163 // http://crbug.com/691449
164 #if defined(OS_CHROMEOS) 164 #if defined(OS_CHROMEOS)
165 #define MAYBE_ReadFile DISABLED_ReadFile
166 #else
165 #define MAYBE_ReadFile ReadFile 167 #define MAYBE_ReadFile ReadFile
166 #else
167 #define MAYBE_ReadFile DISABLED_ReadFile
168 #endif 168 #endif
169 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, MAYBE_ReadFile) { 169 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, MAYBE_ReadFile) {
170 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/read_file", 170 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/read_file",
171 kFlagLoadAsComponent)) 171 kFlagLoadAsComponent))
172 << message_; 172 << message_;
173 } 173 }
174 174
175 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, BigFile) { 175 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, BigFile) {
176 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/big_file", 176 ASSERT_TRUE(RunPlatformAppTestWithFlags("file_system_provider/big_file",
177 kFlagLoadAsComponent)) 177 kFlagLoadAsComponent))
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 } 287 }
288 288
289 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, Unresponsive_App) { 289 IN_PROC_BROWSER_TEST_F(FileSystemProviderApiTest, Unresponsive_App) {
290 AbortOnUnresponsivePerformer performer(browser()->profile()); 290 AbortOnUnresponsivePerformer performer(browser()->profile());
291 ASSERT_TRUE(RunPlatformAppTestWithFlags( 291 ASSERT_TRUE(RunPlatformAppTestWithFlags(
292 "file_system_provider/unresponsive_app", kFlagLoadAsComponent)) 292 "file_system_provider/unresponsive_app", kFlagLoadAsComponent))
293 << message_; 293 << message_;
294 } 294 }
295 295
296 } // namespace extensions 296 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698