Some cleanup of app and extension CSP tests.

chrome/browser/apps/app_browsertest.cc

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..19a4aea453ab28bcff75c5d3d5168b9eb1656d21 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -450,13 +450,7 @@ 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());
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/iframes")) << message_;
 }
@@ -1367,4 +1361,5 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, AppWindowIframe) {
                            "APP_WINDOW_CREATE_CALLBACK");
 }
 
+
 }  // namespace extensions