| Index: chrome/browser/extensions/app_background_page_apitest.cc
|
| diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
|
| index 51e6313059aeca1051bb938f58238a5a8b3389de..ac1db73bc9b7b6687f6f01df6a0abf872a54444c 100644
|
| --- a/chrome/browser/extensions/app_background_page_apitest.cc
|
| +++ b/chrome/browser/extensions/app_background_page_apitest.cc
|
| @@ -79,7 +79,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, MAYBE_Basic) {
|
| ASSERT_TRUE(RunExtensionTest("app_background_page/basic")) << message_;
|
| }
|
|
|
| -// Crashy, http://crbug.com/49215.
|
| +// Crashy, http://crbug.com/69215.
|
| IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_LacksPermission) {
|
| host_resolver()->AddRule("a.com", "127.0.0.1");
|
| ASSERT_TRUE(StartTestServer());
|
| @@ -137,3 +137,29 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, ManifestBackgroundPage) {
|
| BackgroundContentsServiceFactory::GetForProfile(browser()->profile())->
|
| GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
|
| }
|
| +
|
| +IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, OpenTwoBackgroundPages) {
|
| + host_resolver()->AddRule("a.com", "127.0.0.1");
|
| + ASSERT_TRUE(StartTestServer());
|
| +
|
| + std::string app_manifest = base::StringPrintf(
|
| + "{"
|
| + " \"name\": \"App\","
|
| + " \"version\": \"0.1\","
|
| + " \"app\": {"
|
| + " \"urls\": ["
|
| + " \"http://a.com/\""
|
| + " ],"
|
| + " \"launch\": {"
|
| + " \"web_url\": \"http://a.com:%d/\""
|
| + " }"
|
| + " },"
|
| + " \"permissions\": [\"background\"]"
|
| + "}",
|
| + test_server()->host_port_pair().port());
|
| +
|
| + FilePath app_dir;
|
| + ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
|
| + ASSERT_TRUE(LoadExtension(app_dir));
|
| + ASSERT_TRUE(RunExtensionTest("app_background_page/two_pages")) << message_;
|
| +}
|
|
|