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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "net/base/mock_host_resolver.h" 6 #include "net/base/mock_host_resolver.h"
7 7
8 class ExecuteScriptApiTest : public ExtensionApiTest { 8 class ExecuteScriptApiTest : public ExtensionApiTest {
9 protected: 9 protected:
10 void SetupDelayedHostResolver() { 10 void SetupDelayedHostResolver() {
11 // We need a.com to be a little bit slow to trigger a race condition. 11 // We need a.com to be a little bit slow to trigger a race condition.
12 host_resolver()->AddRuleWithLatency("a.com", "127.0.0.1", 500); 12 host_resolver()->AddRuleWithLatency("a.com", "127.0.0.1", 500);
13 host_resolver()->AddRule("b.com", "127.0.0.1"); 13 host_resolver()->AddRule("b.com", "127.0.0.1");
14 host_resolver()->AddRule("c.com", "127.0.0.1"); 14 host_resolver()->AddRule("c.com", "127.0.0.1");
15 } 15 }
16 }; 16 };
17 17
18 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptBasic) { 18 // DISABLED http://crbug.com/92105
19 #if defined(OS_CHROMEOS)
20 #define MAYBE_ExecuteScriptBasic DISABLED_ExecuteScriptBasic
21 #else
22 #define MAYBE_ExecuteScriptBasic ExecuteScriptBasic
23 #endif // defined(OS_CHROMEOS)
24
25 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptBasic) {
19 SetupDelayedHostResolver(); 26 SetupDelayedHostResolver();
20 ASSERT_TRUE(StartTestServer()); 27 ASSERT_TRUE(StartTestServer());
21 ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_; 28 ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_;
22 } 29 }
23 30
24 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptInFrame) { 31 // DISABLED http://crbug.com/92105
32 #if defined(OS_CHROMEOS)
33 #define MAYBE_ExecuteScriptInFrame DISABLED_ExecuteScriptInFrame
34 #else
35 #define MAYBE_ExecuteScriptInFrame ExecuteScriptInFrame
36 #endif // defined(OS_CHROMEOS)
37
38 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptInFrame) {
25 SetupDelayedHostResolver(); 39 SetupDelayedHostResolver();
26 ASSERT_TRUE(StartTestServer()); 40 ASSERT_TRUE(StartTestServer());
27 ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_; 41 ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_;
28 } 42 }
29 43
30 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptPermissions) { 44 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptPermissions) {
31 SetupDelayedHostResolver(); 45 SetupDelayedHostResolver();
32 ASSERT_TRUE(StartTestServer()); 46 ASSERT_TRUE(StartTestServer());
33 ASSERT_TRUE(RunExtensionTest("executescript/permissions")) << message_; 47 ASSERT_TRUE(RunExtensionTest("executescript/permissions")) << message_;
34 } 48 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 87
74 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, 88 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
75 MAYBE_NavigationRaceJavaScriptUrl) { 89 MAYBE_NavigationRaceJavaScriptUrl) {
76 host_resolver()->AddRule("a.com", "127.0.0.1"); 90 host_resolver()->AddRule("a.com", "127.0.0.1");
77 host_resolver()->AddRule("b.com", "127.0.0.1"); 91 host_resolver()->AddRule("b.com", "127.0.0.1");
78 ASSERT_TRUE(StartTestServer()); 92 ASSERT_TRUE(StartTestServer());
79 ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race", 93 ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race",
80 "javascript_url.html")) << message_; 94 "javascript_url.html")) << message_;
81 } 95 }
82 96
83 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFrameAfterLoad) { 97 // DISABLED http://crbug.com/92105
98 #if defined(OS_CHROMEOS)
99 #define MAYBE_ExecuteScriptFrameAfterLoad DISABLED_ExecuteScriptFrameAfterLoad
100 #else
101 #define MAYBE_ExecuteScriptFrameAfterLoad ExecuteScriptFrameAfterLoad
102 #endif // defined(OS_CHROMEOS)
103
104 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
105 MAYBE_ExecuteScriptFrameAfterLoad) {
84 SetupDelayedHostResolver(); 106 SetupDelayedHostResolver();
85 ASSERT_TRUE(StartTestServer()); 107 ASSERT_TRUE(StartTestServer());
86 ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_; 108 ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_;
87 } 109 }
OLDNEW
« 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