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/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/json/json_file_value_serializer.h" | 9 #include "base/json/json_file_value_serializer.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 test_data_dir_.AppendASCII("filebrowser_component")); | 337 test_data_dir_.AppendASCII("filebrowser_component")); |
338 ASSERT_TRUE(extension) << message_; | 338 ASSERT_TRUE(extension) << message_; |
339 std::string path = "filesystem:chrome-extension://" + extension->id() + | 339 std::string path = "filesystem:chrome-extension://" + extension->id() + |
340 "/external" + test_file.value(); | 340 "/external" + test_file.value(); |
341 GURL url = extension->GetResourceURL("intent.html#" + path); | 341 GURL url = extension->GetResourceURL("intent.html#" + path); |
342 ui_test_utils::NavigateToURL(browser(), url); | 342 ui_test_utils::NavigateToURL(browser(), url); |
343 | 343 |
344 // The webintent_handler sends chrome.test.succeed() on successful receipt | 344 // The webintent_handler sends chrome.test.succeed() on successful receipt |
345 // of the incoming Web Intent. | 345 // of the incoming Web Intent. |
346 ASSERT_TRUE(catcher.GetNextResult()) << message_; | 346 ASSERT_TRUE(catcher.GetNextResult()) << message_; |
347 CloseShellWindowsAndWaitForAppToExit(); | |
348 } | 347 } |
349 | 348 |
350 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTestWrite) { | 349 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTestWrite) { |
351 AddTmpMountPoint(); | 350 AddTmpMountPoint(); |
352 ASSERT_TRUE(RunExtensionTest("filesystem_handler_write")) << message_; | 351 ASSERT_TRUE(RunExtensionTest("filesystem_handler_write")) << message_; |
353 ASSERT_TRUE(RunExtensionSubtest( | 352 ASSERT_TRUE(RunExtensionSubtest( |
354 "filebrowser_component", "write.html", kComponentFlags)) << message_; | 353 "filebrowser_component", "write.html", kComponentFlags)) << message_; |
355 } | 354 } |
356 | 355 |
357 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, | 356 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
474 _, _)) | 473 _, _)) |
475 .WillOnce(MockDownloadFileCallback(google_apis::HTTP_SUCCESS)); | 474 .WillOnce(MockDownloadFileCallback(google_apis::HTTP_SUCCESS)); |
476 | 475 |
477 // On exit, all operations in progress should be cancelled. | 476 // On exit, all operations in progress should be cancelled. |
478 EXPECT_CALL(*mock_drive_service_, CancelAll()); | 477 EXPECT_CALL(*mock_drive_service_, CancelAll()); |
479 | 478 |
480 // All is set... RUN THE TEST. | 479 // All is set... RUN THE TEST. |
481 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html", | 480 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html", |
482 kComponentFlags)) << message_; | 481 kComponentFlags)) << message_; |
483 } | 482 } |
OLD | NEW |