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

Side by Side Diff: chrome/browser/extensions/extension_local_filesystem_apitest.cc

Issue 8495044: Fix FileSystemExtensionApiTest.FileBrowserTest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make reader local again Created 9 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/filesystem_handler/tab.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/profiles/profile.h" 6 #include "chrome/browser/profiles/profile.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "webkit/fileapi/file_system_context.h" 8 #include "webkit/fileapi/file_system_context.h"
9 #include "webkit/fileapi/file_system_mount_point_provider.h" 9 #include "webkit/fileapi/file_system_mount_point_provider.h"
10 #include "webkit/fileapi/file_system_path_manager.h" 10 #include "webkit/fileapi/file_system_path_manager.h"
(...skipping 20 matching lines...) Expand all
31 private: 31 private:
32 FilePath test_mount_point_; 32 FilePath test_mount_point_;
33 }; 33 };
34 34
35 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, LocalFileSystem) { 35 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, LocalFileSystem) {
36 AddTmpMountPoint(); 36 AddTmpMountPoint();
37 ASSERT_TRUE(RunComponentExtensionTest("local_filesystem")) << message_; 37 ASSERT_TRUE(RunComponentExtensionTest("local_filesystem")) << message_;
38 38
39 } 39 }
40 40
41 #if defined(OS_CHROMEOS) 41 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTest) {
42 // http://crbug.com/103406
43 #define MAYBE_FileBrowserTest DISABLED_FileBrowserTest
44 #else
45 #define MAYBE_FileBrowserTest FileBrowserTest
46 #endif
47
48 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, MAYBE_FileBrowserTest) {
49 AddTmpMountPoint(); 42 AddTmpMountPoint();
50 ASSERT_TRUE(RunExtensionTest("filesystem_handler")) << message_; 43 ASSERT_TRUE(RunExtensionTest("filesystem_handler")) << message_;
51 ASSERT_TRUE(RunComponentExtensionTest("filebrowser_component")) << message_; 44 ASSERT_TRUE(RunComponentExtensionTest("filebrowser_component")) << message_;
52 } 45 }
53 46
54 #endif 47 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/filesystem_handler/tab.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698