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

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

Issue 11117011: Keep browser process alive while there are platform apps with background pages running. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Delegated Created 8 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
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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 test_data_dir_.AppendASCII("filebrowser_component")); 317 test_data_dir_.AppendASCII("filebrowser_component"));
318 ASSERT_TRUE(extension) << message_; 318 ASSERT_TRUE(extension) << message_;
319 std::string path = "filesystem:chrome-extension://" + extension->id() + 319 std::string path = "filesystem:chrome-extension://" + extension->id() +
320 "/external" + test_file.value(); 320 "/external" + test_file.value();
321 GURL url = extension->GetResourceURL("intent.html#" + path); 321 GURL url = extension->GetResourceURL("intent.html#" + path);
322 ui_test_utils::NavigateToURL(browser(), url); 322 ui_test_utils::NavigateToURL(browser(), url);
323 323
324 // The webintent_handler sends chrome.test.succeed() on successful receipt 324 // The webintent_handler sends chrome.test.succeed() on successful receipt
325 // of the incoming Web Intent. 325 // of the incoming Web Intent.
326 ASSERT_TRUE(catcher.GetNextResult()) << message_; 326 ASSERT_TRUE(catcher.GetNextResult()) << message_;
327 CloseShellWindowsAndWaitForAppToExit();
327 } 328 }
328 329
329 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTestWrite) { 330 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, FileBrowserTestWrite) {
330 AddTmpMountPoint(); 331 AddTmpMountPoint();
331 ASSERT_TRUE(RunExtensionTest("filesystem_handler_write")) << message_; 332 ASSERT_TRUE(RunExtensionTest("filesystem_handler_write")) << message_;
332 ASSERT_TRUE(RunExtensionSubtest( 333 ASSERT_TRUE(RunExtensionSubtest(
333 "filebrowser_component", "write.html", kComponentFlags)) << message_; 334 "filebrowser_component", "write.html", kComponentFlags)) << message_;
334 } 335 }
335 336
336 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest, 337 IN_PROC_BROWSER_TEST_F(FileSystemExtensionApiTest,
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 _, _)) 438 _, _))
438 .WillOnce(MockDownloadFileCallback(google_apis::HTTP_SUCCESS)); 439 .WillOnce(MockDownloadFileCallback(google_apis::HTTP_SUCCESS));
439 440
440 // On exit, all operations in progress should be cancelled. 441 // On exit, all operations in progress should be cancelled.
441 EXPECT_CALL(*mock_drive_service_, CancelAll()); 442 EXPECT_CALL(*mock_drive_service_, CancelAll());
442 443
443 // All is set... RUN THE TEST. 444 // All is set... RUN THE TEST.
444 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html", 445 EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html",
445 kComponentFlags)) << message_; 446 kComponentFlags)) << message_;
446 } 447 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698