| OLD | NEW |
| 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() { |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 } | 70 } |
| 71 | 71 |
| 72 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceExecuteScript) { | 72 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceExecuteScript) { |
| 73 host_resolver()->AddRule("a.com", "127.0.0.1"); | 73 host_resolver()->AddRule("a.com", "127.0.0.1"); |
| 74 host_resolver()->AddRule("b.com", "127.0.0.1"); | 74 host_resolver()->AddRule("b.com", "127.0.0.1"); |
| 75 ASSERT_TRUE(StartTestServer()); | 75 ASSERT_TRUE(StartTestServer()); |
| 76 ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race", | 76 ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race", |
| 77 "execute_script.html")) << message_; | 77 "execute_script.html")) << message_; |
| 78 } | 78 } |
| 79 | 79 |
| 80 | 80 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceJavaScriptURL) { |
| 81 #if defined(OS_LINUX) | |
| 82 // Fails on Linux. http://crbug.com/89731 | |
| 83 #define MAYBE_NavigationRaceJavaScriptUrl DISABLED_NavigationRaceJavaScriptUrl | |
| 84 #else | |
| 85 #define MAYBE_NavigationRaceJavaScriptUrl NavigationRaceJavaScriptUrl | |
| 86 #endif | |
| 87 | |
| 88 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, | |
| 89 MAYBE_NavigationRaceJavaScriptUrl) { | |
| 90 host_resolver()->AddRule("a.com", "127.0.0.1"); | 81 host_resolver()->AddRule("a.com", "127.0.0.1"); |
| 91 host_resolver()->AddRule("b.com", "127.0.0.1"); | 82 host_resolver()->AddRule("b.com", "127.0.0.1"); |
| 92 ASSERT_TRUE(StartTestServer()); | 83 ASSERT_TRUE(StartTestServer()); |
| 93 ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race", | 84 ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race", |
| 94 "javascript_url.html")) << message_; | 85 "javascript_url.html")) << message_; |
| 95 } | 86 } |
| 96 | 87 |
| 97 // DISABLED http://crbug.com/92105 | 88 // DISABLED http://crbug.com/92105 |
| 98 #if defined(OS_CHROMEOS) | 89 #if defined(OS_CHROMEOS) |
| 99 #define MAYBE_ExecuteScriptFrameAfterLoad DISABLED_ExecuteScriptFrameAfterLoad | 90 #define MAYBE_ExecuteScriptFrameAfterLoad DISABLED_ExecuteScriptFrameAfterLoad |
| 100 #else | 91 #else |
| 101 #define MAYBE_ExecuteScriptFrameAfterLoad ExecuteScriptFrameAfterLoad | 92 #define MAYBE_ExecuteScriptFrameAfterLoad ExecuteScriptFrameAfterLoad |
| 102 #endif // defined(OS_CHROMEOS) | 93 #endif // defined(OS_CHROMEOS) |
| 103 | 94 |
| 104 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, | 95 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, |
| 105 MAYBE_ExecuteScriptFrameAfterLoad) { | 96 MAYBE_ExecuteScriptFrameAfterLoad) { |
| 106 SetupDelayedHostResolver(); | 97 SetupDelayedHostResolver(); |
| 107 ASSERT_TRUE(StartTestServer()); | 98 ASSERT_TRUE(StartTestServer()); |
| 108 ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_; | 99 ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_; |
| 109 } | 100 } |
| OLD | NEW |