| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 20109 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 | 7 |
| 7 // This test failed at times on the Vista dbg builder and has been marked as | 8 // This test failed at times on the Vista dbg builder and has been marked as |
| 8 // flaky for now. Bug http://code.google.com/p/chromium/issues/detail?id=28630 | 9 // flaky for now. Bug http://code.google.com/p/chromium/issues/detail?id=28630 |
| 9 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_ExecuteScript) { | 10 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_ExecuteScript) { |
| 10 // 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. |
| 11 host_resolver()->AddRuleWithLatency("a.com", "127.0.0.1", 500); | 12 host_resolver()->AddRuleWithLatency("a.com", "127.0.0.1", 500); |
| 12 host_resolver()->AddRule("b.com", "127.0.0.1"); | 13 host_resolver()->AddRule("b.com", "127.0.0.1"); |
| 13 host_resolver()->AddRule("c.com", "127.0.0.1"); | 14 host_resolver()->AddRule("c.com", "127.0.0.1"); |
| 14 StartHTTPServer(); | 15 StartHTTPServer(); |
| 15 | 16 |
| 16 ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_; | 17 ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_; |
| 17 ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_; | 18 ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_; |
| 18 ASSERT_TRUE(RunExtensionTest("executescript/permissions")) << message_; | 19 ASSERT_TRUE(RunExtensionTest("executescript/permissions")) << message_; |
| 19 } | 20 } |
| OLD | NEW |