| Index: chrome/browser/apps/app_browsertest.cc
|
| diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
|
| index 2fdf6f8a89c72e0c1259a30f740bbdf445510eb9..024cd0fe5c26be5ff592cb164c92ce3f1c2aaf09 100644
|
| --- a/chrome/browser/apps/app_browsertest.cc
|
| +++ b/chrome/browser/apps/app_browsertest.cc
|
| @@ -450,14 +450,13 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
|
| observer.tabs()[kExpectedNumberOfTabs - 2]->GetURL());
|
| }
|
|
|
| -// Failing on some Win and Linux buildbots. See crbug.com/354425.
|
| -#if defined(OS_WIN) || defined(OS_LINUX)
|
| -#define MAYBE_Iframes DISABLED_Iframes
|
| -#else
|
| -#define MAYBE_Iframes Iframes
|
| -#endif
|
| -IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_Iframes) {
|
| +IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, Iframes) {
|
| ASSERT_TRUE(StartEmbeddedTestServer());
|
| +
|
| + const Extension* extension =
|
| + LoadExtension(test_data_dir_.AppendASCII("uitest/window_open"));
|
| + EXPECT_EQ("bflfoohhdbcfojbnfcnjpifhimomlgmp", extension->id());
|
| +
|
| ASSERT_TRUE(RunPlatformAppTest("platform_apps/iframes")) << message_;
|
| }
|
|
|
| @@ -1367,4 +1366,5 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWindowIframe) {
|
| "APP_WINDOW_CREATE_CALLBACK");
|
| }
|
|
|
| +
|
| } // namespace extensions
|
|
|