| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 #else | 122 #else |
| 123 #define MAYBE_Messaging Messaging | 123 #define MAYBE_Messaging Messaging |
| 124 #endif | 124 #endif |
| 125 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Messaging) { | 125 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Messaging) { |
| 126 ASSERT_TRUE(StartEmbeddedTestServer()); | 126 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 127 ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_; | 127 ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_; |
| 128 } | 128 } |
| 129 | 129 |
| 130 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingCrash) { | 130 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingCrash) { |
| 131 ASSERT_TRUE(StartEmbeddedTestServer()); | 131 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 132 ExtensionTestMessageListener ready_to_crash("ready_to_crash", true); | 132 ExtensionTestMessageListener ready_to_crash("ready_to_crash", false); |
| 133 ASSERT_TRUE(LoadExtension( | 133 ASSERT_TRUE(LoadExtension( |
| 134 test_data_dir_.AppendASCII("messaging/connect_crash"))); | 134 test_data_dir_.AppendASCII("messaging/connect_crash"))); |
| 135 ui_test_utils::NavigateToURL( | 135 ui_test_utils::NavigateToURL( |
| 136 browser(), embedded_test_server()->GetURL("/extensions/test_file.html")); | 136 browser(), embedded_test_server()->GetURL("/extensions/test_file.html")); |
| 137 content::WebContents* tab = | 137 content::WebContents* tab = |
| 138 browser()->tab_strip_model()->GetActiveWebContents(); | 138 browser()->tab_strip_model()->GetActiveWebContents(); |
| 139 EXPECT_TRUE(ready_to_crash.WaitUntilSatisfied()); | 139 EXPECT_TRUE(ready_to_crash.WaitUntilSatisfied()); |
| 140 | 140 |
| 141 ResultCatcher catcher; | 141 ResultCatcher catcher; |
| 142 CrashTab(tab); | 142 CrashTab(tab); |
| (...skipping 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1250 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); | 1250 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); |
| 1251 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, | 1251 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, |
| 1252 CanConnectAndSendMessagesToMainFrame(invalid.get())); | 1252 CanConnectAndSendMessagesToMainFrame(invalid.get())); |
| 1253 } | 1253 } |
| 1254 | 1254 |
| 1255 #endif // !defined(OS_WIN) - http://crbug.com/350517. | 1255 #endif // !defined(OS_WIN) - http://crbug.com/350517. |
| 1256 | 1256 |
| 1257 } // namespace | 1257 } // namespace |
| 1258 | 1258 |
| 1259 }; // namespace extensions | 1259 }; // namespace extensions |
| OLD | NEW |