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

Side by Side Diff: chrome/browser/extensions/api/media_galleries/media_galleries_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: And another test Created 8 years 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/stringprintf.h" 6 #include "base/stringprintf.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/extensions/extension_process_manager.h" 9 #include "chrome/browser/extensions/extension_process_manager.h"
10 #include "chrome/browser/extensions/extension_system.h" 10 #include "chrome/browser/extensions/extension_system.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, NoGalleries) { 51 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, NoGalleries) {
52 chrome::EnsureMediaDirectoriesExists media_directories; 52 chrome::EnsureMediaDirectoriesExists media_directories;
53 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_galleries")) 53 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_galleries"))
54 << message_; 54 << message_;
55 } 55 }
56 56
57 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, 57 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest,
58 MediaGalleriesRead) { 58 MediaGalleriesRead) {
59 chrome::EnsureMediaDirectoriesExists media_directories; 59 chrome::EnsureMediaDirectoriesExists media_directories;
60 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/read_access")) 60 ASSERT_TRUE(RunPlatformAppTestReturnImmediately(
61 << message_; 61 "api_test/media_galleries/read_access")) << message_;
62 RunSecondTestPhase(media_directories.num_galleries()); 62 RunSecondTestPhase(media_directories.num_galleries());
63 CloseShellWindowsAndWaitForAppToExit();
63 } 64 }
64 65
65 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest, 66 IN_PROC_BROWSER_TEST_F(PlatformAppMediaGalleriesBrowserTest,
66 MediaGalleriesNoAccess) { 67 MediaGalleriesNoAccess) {
67 chrome::EnsureMediaDirectoriesExists media_directories; 68 chrome::EnsureMediaDirectoriesExists media_directories;
68 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_access")) 69 ASSERT_TRUE(RunPlatformAppTestReturnImmediately(
69 << message_; 70 "api_test/media_galleries/no_access")) << message_;
70 RunSecondTestPhase(media_directories.num_galleries()); 71 RunSecondTestPhase(media_directories.num_galleries());
72 CloseShellWindowsAndWaitForAppToExit();
71 } 73 }
72 74
73 IN_PROC_BROWSER_TEST_F(ExperimentalMediaGalleriesApiTest, 75 IN_PROC_BROWSER_TEST_F(ExperimentalMediaGalleriesApiTest,
74 ExperimentalMediaGalleries) { 76 ExperimentalMediaGalleries) {
75 ASSERT_TRUE(RunExtensionTest("media_galleries/experimental")) << message_; 77 ASSERT_TRUE(RunExtensionTest("media_galleries/experimental")) << message_;
76 } 78 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698