OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/dns/mock_host_resolver.h" | 6 #include "net/dns/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() { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 ASSERT_TRUE(RunExtensionTest("executescript/file_after_close")) << message_; | 50 ASSERT_TRUE(RunExtensionTest("executescript/file_after_close")) << message_; |
51 } | 51 } |
52 | 52 |
53 // If crashing, mark disabled and update http://crbug.com/67774. | 53 // If crashing, mark disabled and update http://crbug.com/67774. |
54 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFragmentNavigation) { | 54 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFragmentNavigation) { |
55 ASSERT_TRUE(StartTestServer()); | 55 ASSERT_TRUE(StartTestServer()); |
56 const char* extension_name = "executescript/fragment"; | 56 const char* extension_name = "executescript/fragment"; |
57 ASSERT_TRUE(RunExtensionTest(extension_name)) << message_; | 57 ASSERT_TRUE(RunExtensionTest(extension_name)) << message_; |
58 } | 58 } |
59 | 59 |
60 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceExecuteScript) { | 60 // Fails often on Windows dbg bots. http://crbug.com/177163 |
| 61 #if defined(OS_WIN) |
| 62 #define MAYBE_NavigationRaceExecuteScript DISABLED_NavigationRaceExecuteScript |
| 63 #else |
| 64 #define MAYBE_NavigationRaceExecuteScript NavigationRaceExecuteScript |
| 65 #endif // defined(OS_WIN) |
| 66 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, |
| 67 MAYBE_NavigationRaceExecuteScript) { |
61 host_resolver()->AddRule("a.com", "127.0.0.1"); | 68 host_resolver()->AddRule("a.com", "127.0.0.1"); |
62 host_resolver()->AddRule("b.com", "127.0.0.1"); | 69 host_resolver()->AddRule("b.com", "127.0.0.1"); |
63 ASSERT_TRUE(StartTestServer()); | 70 ASSERT_TRUE(StartTestServer()); |
64 ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race", | 71 ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race", |
65 "execute_script.html")) << message_; | 72 "execute_script.html")) << message_; |
66 } | 73 } |
67 | 74 |
68 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceJavaScriptURL) { | 75 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceJavaScriptURL) { |
69 host_resolver()->AddRule("a.com", "127.0.0.1"); | 76 host_resolver()->AddRule("a.com", "127.0.0.1"); |
70 host_resolver()->AddRule("b.com", "127.0.0.1"); | 77 host_resolver()->AddRule("b.com", "127.0.0.1"); |
(...skipping 13 matching lines...) Expand all Loading... |
84 SetupDelayedHostResolver(); | 91 SetupDelayedHostResolver(); |
85 ASSERT_TRUE(StartTestServer()); | 92 ASSERT_TRUE(StartTestServer()); |
86 ASSERT_TRUE(RunExtensionTest("executescript/run_at")) << message_; | 93 ASSERT_TRUE(RunExtensionTest("executescript/run_at")) << message_; |
87 } | 94 } |
88 | 95 |
89 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptCallback) { | 96 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptCallback) { |
90 SetupDelayedHostResolver(); | 97 SetupDelayedHostResolver(); |
91 ASSERT_TRUE(StartTestServer()); | 98 ASSERT_TRUE(StartTestServer()); |
92 ASSERT_TRUE(RunExtensionTest("executescript/callback")) << message_; | 99 ASSERT_TRUE(RunExtensionTest("executescript/callback")) << message_; |
93 } | 100 } |
OLD | NEW |