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

Side by Side Diff: chrome/browser/chromeos/extensions/external_filesystem_apitest.cc

Issue 10411022: Change bug for disabled RemoteFileSystemExtensionApiTest.RemoteMountPoint test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/test/data/chromeos/gdata/remote_file_system_apitest_root_feed.json » ('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) 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/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/json/json_file_value_serializer.h" 8 #include "base/json/json_file_value_serializer.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop_proxy.h" 10 #include "base/message_loop_proxy.h"
(...skipping 20 matching lines...) Expand all
31 #include "webkit/fileapi/file_system_context.h" 31 #include "webkit/fileapi/file_system_context.h"
32 #include "webkit/fileapi/file_system_mount_point_provider.h" 32 #include "webkit/fileapi/file_system_mount_point_provider.h"
33 33
34 using ::testing::_; 34 using ::testing::_;
35 using ::testing::Return; 35 using ::testing::Return;
36 using content::BrowserContext; 36 using content::BrowserContext;
37 37
38 namespace { 38 namespace {
39 39
40 // These should match the counterparts in remote.js. 40 // These should match the counterparts in remote.js.
41 // Also, the size of the file in |kTestRootFeed| has to be set to
42 // |size(kTestFileContents)|.
41 const char kTestFileContents[] = "hello, world"; 43 const char kTestFileContents[] = "hello, world";
42 44
43 // Contains a folder entry for the folder 'Folder' that will be 'created'. 45 // Contains a folder entry for the folder 'Folder' that will be 'created'.
44 const char kTestDirectory[] = "new_folder_entry.json"; 46 const char kTestDirectory[] = "new_folder_entry.json";
45 47
46 // Contains a folder named Folder that has a file File.aBc inside of it. 48 // Contains a folder named Folder that has a file File.aBc inside of it.
47 const char kTestRootFeed[] = "remote_file_system_apitest_root_feed.json"; 49 const char kTestRootFeed[] = "remote_file_system_apitest_root_feed.json";
48 50
49 // The ID of the file browser extension. 51 // The ID of the file browser extension.
50 const char kFileBrowserExtensionId[] = "ddammdhioacbehjngdmkjcjbnfginlla"; 52 const char kFileBrowserExtensionId[] = "ddammdhioacbehjngdmkjcjbnfginlla";
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, 248 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest,
247 FileBrowserTestWriteComponent) { 249 FileBrowserTestWriteComponent) {
248 AddTmpMountPoint(); 250 AddTmpMountPoint();
249 ASSERT_TRUE(RunComponentExtensionTest("filesystem_handler_write")) 251 ASSERT_TRUE(RunComponentExtensionTest("filesystem_handler_write"))
250 << message_; 252 << message_;
251 ASSERT_TRUE(RunExtensionSubtest( 253 ASSERT_TRUE(RunExtensionSubtest(
252 "filebrowser_component", "write.html", kComponentFlags)) << message_; 254 "filebrowser_component", "write.html", kComponentFlags)) << message_;
253 } 255 }
254 256
255 // Failing on Linux ChromeOS builds. 257 // Failing on Linux ChromeOS builds.
256 // http://crbug.com/128757 258 // http://crbug.com/128759
257 IN_PROC_BROWSER_TEST_F(RemoteFileSystemExtensionApiTest, 259 IN_PROC_BROWSER_TEST_F(RemoteFileSystemExtensionApiTest,
258 DISABLED_RemoteMountPoint) { 260 DISABLED_RemoteMountPoint) {
259 SetupGDataFileSystemForTest(); 261 SetupGDataFileSystemForTest();
260 262
261 EXPECT_CALL(*mock_documents_service_, GetAccountMetadata(_)).Times(1); 263 EXPECT_CALL(*mock_documents_service_, GetAccountMetadata(_)).Times(1);
262 264
263 // First, file browser will try to create new directory. 265 // First, file browser will try to create new directory.
264 scoped_ptr<base::Value> dir_value(LoadJSONFile(kTestDirectory)); 266 scoped_ptr<base::Value> dir_value(LoadJSONFile(kTestDirectory));
265 EXPECT_CALL(*mock_documents_service_, 267 EXPECT_CALL(*mock_documents_service_,
266 CreateDirectory(_, _, _)) 268 CreateDirectory(_, _, _))
(...skipping 23 matching lines...) Expand all
290 // This one is called on exit, but we don't care much about it, as long as it 292 // This one is called on exit, but we don't care much about it, as long as it
291 // retunrs something valid (i.e. not NULL). 293 // retunrs something valid (i.e. not NULL).
292 EXPECT_CALL(*mock_documents_service_, operation_registry()). 294 EXPECT_CALL(*mock_documents_service_, operation_registry()).
293 WillOnce(Return(operation_registry_.get())); 295 WillOnce(Return(operation_registry_.get()));
294 296
295 // All is set... RUN THE TEST. 297 // All is set... RUN THE TEST.
296 EXPECT_TRUE(RunExtensionTest("filesystem_handler")) << message_; 298 EXPECT_TRUE(RunExtensionTest("filesystem_handler")) << message_;
297 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote.html", 299 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote.html",
298 kComponentFlags)) << message_; 300 kComponentFlags)) << message_;
299 } 301 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/chromeos/gdata/remote_file_system_apitest_root_feed.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698