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

Unified Diff: chrome/browser/extensions/execute_script_apitest.cc

Issue 7608003: Disable cros tests on trunk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/execute_script_apitest.cc
===================================================================
--- chrome/browser/extensions/execute_script_apitest.cc (revision 96039)
+++ chrome/browser/extensions/execute_script_apitest.cc (working copy)
@@ -15,13 +15,27 @@
}
};
-IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptBasic) {
+// DISABLED http://crbug.com/92105
+#if defined(OS_CHROMEOS)
+#define MAYBE_ExecuteScriptBasic DISABLED_ExecuteScriptBasic
+#else
+#define MAYBE_ExecuteScriptBasic ExecuteScriptBasic
+#endif // defined(OS_CHROMEOS)
+
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptBasic) {
SetupDelayedHostResolver();
ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_;
}
-IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptInFrame) {
+// DISABLED http://crbug.com/92105
+#if defined(OS_CHROMEOS)
+#define MAYBE_ExecuteScriptInFrame DISABLED_ExecuteScriptInFrame
+#else
+#define MAYBE_ExecuteScriptInFrame ExecuteScriptInFrame
+#endif // defined(OS_CHROMEOS)
+
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptInFrame) {
SetupDelayedHostResolver();
ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_;
@@ -80,7 +94,15 @@
"javascript_url.html")) << message_;
}
-IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFrameAfterLoad) {
+// DISABLED http://crbug.com/92105
+#if defined(OS_CHROMEOS)
+#define MAYBE_ExecuteScriptFrameAfterLoad DISABLED_ExecuteScriptFrameAfterLoad
+#else
+#define MAYBE_ExecuteScriptFrameAfterLoad ExecuteScriptFrameAfterLoad
+#endif // defined(OS_CHROMEOS)
+
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
+ MAYBE_ExecuteScriptFrameAfterLoad) {
SetupDelayedHostResolver();
ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698